[COMMIT osv-apps master] Upgraded jetty to the latest 9.4.19.v20190610

1 view
Skip to first unread message

Commit Bot

unread,
Aug 10, 2019, 10:14:11 AM8/10/19
to osv...@googlegroups.com, Waldemar Kozaczuk
From: Waldemar Kozaczuk <jwkoz...@gmail.com>
Committer: Waldemar Kozaczuk <jwkoz...@gmail.com>
Branch: master

Upgraded jetty to the latest 9.4.19.v20190610

Signed-off-by: Waldemar Kozaczuk <jwkoz...@gmail.com>

---
diff --git a/jetty/GET b/jetty/GET
--- a/jetty/GET
+++ b/jetty/GET
@@ -2,8 +2,8 @@
set -ex
mkdir upstream
cd upstream
-JETTY_VERSION="9.2.11.v20150529"
-wget
-c "http://eclipse.org/downloads/download.php?file=/jetty/${JETTY_VERSION}/dist/jetty-distribution-${JETTY_VERSION}.tar.gz&r=1"
-O jetty.tgz
+JETTY_VERSION="9.4.19.v20190610"
+wget
-c "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${JETTY_VERSION}/jetty-distribution-${JETTY_VERSION}.tar.gz"
-O jetty.tgz
tar zxvf jetty.tgz --strip-components=1
sed '/<!--$/d;/^ *-->$/d' demo-base/webapps/test.d/override-web.xml
>/tmp/$$.xml
mv /tmp/$$.xml demo-base/webapps/test.d/override-web.xml
diff --git a/jetty/Makefile b/jetty/Makefile
--- a/jetty/Makefile
+++ b/jetty/Makefile
@@ -3,6 +3,7 @@ module: upstream

upstream:
./GET
+ touch upstream/demo-base/resources/empty

clean:
-rm -rf upstream
diff --git a/jetty/usr.manifest b/jetty/usr.manifest
--- a/jetty/usr.manifest
+++ b/jetty/usr.manifest
@@ -4,3 +4,4 @@
/jetty/lib/**: ${MODULE_DIR}/upstream/lib/**
/jetty/etc/**: ${MODULE_DIR}/upstream/etc/**
/jetty/modules/**: ${MODULE_DIR}/upstream/modules/**
+/etc/**: ${MODULE_DIR}/upstream/demo-base/etc/**
Reply all
Reply to author
Forward
0 new messages