From eeca0196ab4ee25d24f82182276dabd499f1a2c0 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 23 Dec 2019 00:47:25 +0100 Subject: [PATCH] Update jetty to 9.4.24.v20191120 Change-Id: I6b3dbdfaf344efd174c0786902170f349b1bc8ff Signed-off-by: Matthias Sohn --- WORKSPACE | 26 +++++++------- .../org.eclipse.jgit.target/jgit-4.10.target | 36 +++++++++---------- .../org.eclipse.jgit.target/jgit-4.10.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.11.target | 36 +++++++++---------- .../org.eclipse.jgit.target/jgit-4.11.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.12.target | 36 +++++++++---------- .../org.eclipse.jgit.target/jgit-4.12.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.13.target | 36 +++++++++---------- .../org.eclipse.jgit.target/jgit-4.13.tpd | 2 +- .../jgit-4.14-staging.target | 36 +++++++++---------- .../jgit-4.14-staging.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.6.target | 36 +++++++++---------- .../org.eclipse.jgit.target/jgit-4.6.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.7.target | 36 +++++++++---------- .../org.eclipse.jgit.target/jgit-4.7.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.8.target | 36 +++++++++---------- .../org.eclipse.jgit.target/jgit-4.8.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.9.target | 36 +++++++++---------- .../org.eclipse.jgit.target/jgit-4.9.tpd | 2 +- .../projects/jetty-9.4.22.tpd | 20 ----------- .../projects/jetty-9.4.24.tpd | 20 +++++++++++ pom.xml | 2 +- 22 files changed, 205 insertions(+), 205 deletions(-) delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.22.tpd create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.24.tpd diff --git a/WORKSPACE b/WORKSPACE index a3463a5af..5fd2ed90b 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -203,48 +203,48 @@ maven_jar( sha1 = "3edcfe49d2c6053a70a2a47e4e1c2f94998a49cf", ) -JETTY_VER = "9.4.22.v20191022" +JETTY_VER = "9.4.24.v20191120" maven_jar( name = "jetty-servlet", artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VER, - sha1 = "62285df7713347586d55f3f93a96299d1b721714", - src_sha1 = "fe2d1f1dc7a82ced141df935a0db5b5cadd76f4a", + sha1 = "ca1803fde51b795c0a8346ca8bc6277d9d04d01d", + src_sha1 = "8781c162df92d27456d4370df943f6a5234f32c4", ) maven_jar( name = "jetty-security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER, - sha1 = "f7b3b61f09b34a69fd6df4f267f3907813c9224c", - src_sha1 = "5a1b33c5dde638ce9dbc2e07f0cff862e5029195", + sha1 = "9fa640d36c088cf55843900043d28aef830ade4d", + src_sha1 = "40128e3547b43f09e176fb0738672f483c477119", ) maven_jar( name = "jetty-server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER, - sha1 = "f30b9b2cd6f63b073b63c2ac5e7e7f17b63b0908", - src_sha1 = "97fbdf8eade55f05d7e99c16fd90d394b248f717", + sha1 = "7885cc3d5d7701a444acada7ab97f89846514875", + src_sha1 = "709650068c26029303ab3776d1e5ed6a66e0b065", ) maven_jar( name = "jetty-http", artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER, - sha1 = "f96f87fc73c2b586ff40689cbce6ae62d70f18fa", - src_sha1 = "0e51a30d0e3309acfc6ee548b90ff55165fbfa5c", + sha1 = "d3f0b0fb016ef8d35ffb199d928ffbcbfa121c86", + src_sha1 = "b29d870576e3edff354af0dae86c60d5956cd643", ) maven_jar( name = "jetty-io", artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER, - sha1 = "0f08e62908f94d1238be386302236a42204d566a", - src_sha1 = "d31c00383f13c95404ef606f57513569868acd6b", + sha1 = "dcb6d4d505ef74898e3a64a38c40195c01e97119", + src_sha1 = "863a6c575eadb626b50cda13a6484609a9449934", ) maven_jar( name = "jetty-util", artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER, - sha1 = "ffe0bf81a2a4a534b79dd981f971c7346a563095", - src_sha1 = "42f8abc84a6c4c9d2441d2dfcc60591e3296dc26", + sha1 = "3095acb088f4ff9e3fd9aedf98db73e3c18ea849", + src_sha1 = "f503199317d9df74062d722db4a7af8cf5e59322", ) BOUNCYCASTLE_VER = "1.64" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target index 4a0d80d7f..c5d34634b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target @@ -1,26 +1,26 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd index e85e619ed..ea97f6aac 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd @@ -1,6 +1,6 @@ target "jgit-4.10" with source configurePhase -include "projects/jetty-9.4.22.tpd" +include "projects/jetty-9.4.24.tpd" include "orbit/R20191126223242-2019-12.tpd" location "http://download.eclipse.org/releases/2018-12/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target index 3d3bb3851..975ef7735 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target @@ -1,26 +1,26 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.tpd index cd09465a4..349df838f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.tpd @@ -1,6 +1,6 @@ target "jgit-4.11" with source configurePhase -include "projects/jetty-9.4.22.tpd" +include "projects/jetty-9.4.24.tpd" include "orbit/R20191126223242-2019-12.tpd" location "http://download.eclipse.org/releases/2019-03/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target index 380636cfa..5d276c5e8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target @@ -1,26 +1,26 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.tpd index 8904b99c6..8d3243700 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.tpd @@ -1,6 +1,6 @@ target "jgit-4.12" with source configurePhase -include "projects/jetty-9.4.22.tpd" +include "projects/jetty-9.4.24.tpd" include "orbit/R20191126223242-2019-12.tpd" location "http://download.eclipse.org/releases/2019-06/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target index e0fb34239..d938753a6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target @@ -1,26 +1,26 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.tpd index 1e5f36f77..0603b4087 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.tpd @@ -1,6 +1,6 @@ target "jgit-4.13" with source configurePhase -include "projects/jetty-9.4.22.tpd" +include "projects/jetty-9.4.24.tpd" include "orbit/R20191126223242-2019-12.tpd" location "http://download.eclipse.org/releases/2019-09/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14-staging.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14-staging.target index f3b5965c4..09a3b187b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14-staging.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14-staging.target @@ -1,26 +1,26 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14-staging.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14-staging.tpd index d58281b75..bb6dcc7ec 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14-staging.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14-staging.tpd @@ -1,6 +1,6 @@ target "jgit-4.14-staging" with source configurePhase -include "projects/jetty-9.4.22.tpd" +include "projects/jetty-9.4.24.tpd" include "orbit/R20191126223242-2019-12.tpd" location "http://download.eclipse.org/staging/2019-12/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target index 0c82ed63a..257b8aeea 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target @@ -1,26 +1,26 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd index f29a8252b..a62b26d2a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd @@ -1,6 +1,6 @@ target "jgit-4.6" with source configurePhase -include "projects/jetty-9.4.22.tpd" +include "projects/jetty-9.4.24.tpd" include "orbit/R20191126223242-2019-12.tpd" location "http://download.eclipse.org/releases/neon/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target index 1d7acecb5..daacb72cd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target @@ -1,26 +1,26 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd index 97a2b12e2..4a9e428b6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd @@ -1,6 +1,6 @@ target "jgit-4.7" with source configurePhase -include "projects/jetty-9.4.22.tpd" +include "projects/jetty-9.4.24.tpd" include "orbit/R20191126223242-2019-12.tpd" location "http://download.eclipse.org/releases/oxygen/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target index 8b6bd8caf..624c2df77 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target @@ -1,26 +1,26 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd index 1fea5c19e..ca672b7bb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd @@ -1,6 +1,6 @@ target "jgit-4.8" with source configurePhase -include "projects/jetty-9.4.22.tpd" +include "projects/jetty-9.4.24.tpd" include "orbit/R20191126223242-2019-12.tpd" location "http://download.eclipse.org/releases/photon/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target index 67c389bbb..2c30d8a74 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target @@ -1,26 +1,26 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd index af165488b..c7a832173 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd @@ -1,6 +1,6 @@ target "jgit-4.9" with source configurePhase -include "projects/jetty-9.4.22.tpd" +include "projects/jetty-9.4.24.tpd" include "orbit/R20191126223242-2019-12.tpd" location "http://download.eclipse.org/releases/2018-09/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.22.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.22.tpd deleted file mode 100644 index 562e017d3..000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.22.tpd +++ /dev/null @@ -1,20 +0,0 @@ -target "jetty-9.4.22" with source configurePhase - -location jetty-9.4.22 "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.22.v20191022/" { - org.eclipse.jetty.client [9.4.22.v20191022,9.4.22.v20191022] - org.eclipse.jetty.client.source [9.4.22.v20191022,9.4.22.v20191022] - org.eclipse.jetty.continuation [9.4.22.v20191022,9.4.22.v20191022] - org.eclipse.jetty.continuation.source [9.4.22.v20191022,9.4.22.v20191022] - org.eclipse.jetty.http [9.4.22.v20191022,9.4.22.v20191022] - org.eclipse.jetty.http.source [9.4.22.v20191022,9.4.22.v20191022] - org.eclipse.jetty.io [9.4.22.v20191022,9.4.22.v20191022] - org.eclipse.jetty.io.source [9.4.22.v20191022,9.4.22.v20191022] - org.eclipse.jetty.security [9.4.22.v20191022,9.4.22.v20191022] - org.eclipse.jetty.security.source [9.4.22.v20191022,9.4.22.v20191022] - org.eclipse.jetty.server [9.4.22.v20191022,9.4.22.v20191022] - org.eclipse.jetty.server.source [9.4.22.v20191022,9.4.22.v20191022] - org.eclipse.jetty.servlet [9.4.22.v20191022,9.4.22.v20191022] - org.eclipse.jetty.servlet.source [9.4.22.v20191022,9.4.22.v20191022] - org.eclipse.jetty.util [9.4.22.v20191022,9.4.22.v20191022] - org.eclipse.jetty.util.source [9.4.22.v20191022,9.4.22.v20191022] -} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.24.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.24.tpd new file mode 100644 index 000000000..7b2af0238 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.24.tpd @@ -0,0 +1,20 @@ +target "jetty-9.4.24" with source configurePhase + +location jetty-9.4.24 "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.24.v20191120/" { + org.eclipse.jetty.client [9.4.24.v20191120,9.4.24.v20191120] + org.eclipse.jetty.client.source [9.4.24.v20191120,9.4.24.v20191120] + org.eclipse.jetty.continuation [9.4.24.v20191120,9.4.24.v20191120] + org.eclipse.jetty.continuation.source [9.4.24.v20191120,9.4.24.v20191120] + org.eclipse.jetty.http [9.4.24.v20191120,9.4.24.v20191120] + org.eclipse.jetty.http.source [9.4.24.v20191120,9.4.24.v20191120] + org.eclipse.jetty.io [9.4.24.v20191120,9.4.24.v20191120] + org.eclipse.jetty.io.source [9.4.24.v20191120,9.4.24.v20191120] + org.eclipse.jetty.security [9.4.24.v20191120,9.4.24.v20191120] + org.eclipse.jetty.security.source [9.4.24.v20191120,9.4.24.v20191120] + org.eclipse.jetty.server [9.4.24.v20191120,9.4.24.v20191120] + org.eclipse.jetty.server.source [9.4.24.v20191120,9.4.24.v20191120] + org.eclipse.jetty.servlet [9.4.24.v20191120,9.4.24.v20191120] + org.eclipse.jetty.servlet.source [9.4.24.v20191120,9.4.24.v20191120] + org.eclipse.jetty.util [9.4.24.v20191120,9.4.24.v20191120] + org.eclipse.jetty.util.source [9.4.24.v20191120,9.4.24.v20191120] +} diff --git a/pom.xml b/pom.xml index 1eb56c932..6cb972751 100644 --- a/pom.xml +++ b/pom.xml @@ -195,7 +195,7 @@ 1.18 4.3.1 3.1.0 - 9.4.22.v20191022 + 9.4.24.v20191120 0.14.1 4.5.6 4.4.10