From 333c20aa48610a45a44dbdca694789ceffaecd76 Mon Sep 17 00:00:00 2001 From: Michael Keppler Date: Fri, 25 Oct 2019 13:20:05 +0200 Subject: [PATCH] Upgrade Jetty to 9.4.22.v20191022 Change-Id: Ie2ee0a978949f9cf70833645132eedf26c3cf1c8 Signed-off-by: Michael Keppler 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.21.tpd | 20 ----------- .../projects/jetty-9.4.22.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.21.tpd create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.22.tpd diff --git a/WORKSPACE b/WORKSPACE index ea674f4136..8889fb23b7 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -173,48 +173,48 @@ maven_jar( sha1 = "3edcfe49d2c6053a70a2a47e4e1c2f94998a49cf", ) -JETTY_VER = "9.4.21.v20190926" +JETTY_VER = "9.4.22.v20191022" maven_jar( name = "jetty-servlet", artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VER, - sha1 = "b8b319531d4aa26049cdfc2a8d3431219b9d19aa", - src_sha1 = "1fa9afededcb9370dd750994581c71a891099d84", + sha1 = "62285df7713347586d55f3f93a96299d1b721714", + src_sha1 = "fe2d1f1dc7a82ced141df935a0db5b5cadd76f4a", ) maven_jar( name = "jetty-security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER, - sha1 = "6226803d9f2198acebeba984a910f7a62c1df2da", - src_sha1 = "37aabc7ce483171e62afb0ec3202cdfde99ed2dc", + sha1 = "f7b3b61f09b34a69fd6df4f267f3907813c9224c", + src_sha1 = "5a1b33c5dde638ce9dbc2e07f0cff862e5029195", ) maven_jar( name = "jetty-server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER, - sha1 = "7ada02c441d06602587eeacce7a9693160a20f3e", - src_sha1 = "d02a3241203f14e8c08a5e6a09bb51bd34c9a57d", + sha1 = "f30b9b2cd6f63b073b63c2ac5e7e7f17b63b0908", + src_sha1 = "97fbdf8eade55f05d7e99c16fd90d394b248f717", ) maven_jar( name = "jetty-http", artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER, - sha1 = "cc59f5acae2ed66c209de484ac4d3d2086eaa4d7", - src_sha1 = "7cd581962f6e5b224b932a39d0214e3dcce6992e", + sha1 = "f96f87fc73c2b586ff40689cbce6ae62d70f18fa", + src_sha1 = "0e51a30d0e3309acfc6ee548b90ff55165fbfa5c", ) maven_jar( name = "jetty-io", artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER, - sha1 = "9a65da60b050fc65212cb8e2dd3fba1f300b2141", - src_sha1 = "02700a970340b42932d91b6bc3bac6963159c160", + sha1 = "0f08e62908f94d1238be386302236a42204d566a", + src_sha1 = "d31c00383f13c95404ef606f57513569868acd6b", ) maven_jar( name = "jetty-util", artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER, - sha1 = "72a5fc3be9f0994270599a6e0b829f8a3f554066", - src_sha1 = "7a3827c0fa323def8fcc84af97124e42e3f387e1", + sha1 = "ffe0bf81a2a4a534b79dd981f971c7346a563095", + src_sha1 = "42f8abc84a6c4c9d2441d2dfcc60591e3296dc26", ) BOUNCYCASTLE_VER = "1.61" 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 d8336b7ae1..12543fa0ae 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 54cd636f92..702854da48 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.21.tpd" +include "projects/jetty-9.4.22.tpd" include "orbit/R20190827152740-2019-09.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 e3ce7ea9b8..6b444299b4 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 71ee882beb..7eefebf94d 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.21.tpd" +include "projects/jetty-9.4.22.tpd" include "orbit/R20190827152740-2019-09.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 7f9def6cb8..04ffc29c50 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 3a58b6925e..0b07d12b8c 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.21.tpd" +include "projects/jetty-9.4.22.tpd" include "orbit/R20190827152740-2019-09.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 d506dc4a0c..fbeadecf9f 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 f8f685a87a..6dffb98d40 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.21.tpd" +include "projects/jetty-9.4.22.tpd" include "orbit/R20190827152740-2019-09.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 641e9f8835..ac250dc6b6 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 1c266853c2..9bd7b3dd76 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.21.tpd" +include "projects/jetty-9.4.22.tpd" include "orbit/R20190827152740-2019-09.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 542a882734..cd917fec45 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 373d3168e6..c1a6050266 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.21.tpd" +include "projects/jetty-9.4.22.tpd" include "orbit/R20190827152740-2019-09.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 59ca861464..f0dd4039fe 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 e90a4a44f5..23bda5e649 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.21.tpd" +include "projects/jetty-9.4.22.tpd" include "orbit/R20190827152740-2019-09.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 25b53df6bd..60e20bbc84 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 ad4473b847..d1cf70ed9f 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.21.tpd" +include "projects/jetty-9.4.22.tpd" include "orbit/R20190827152740-2019-09.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 b5d1f13189..a7525c9db0 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 5dce713896..f99cfaa896 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.21.tpd" +include "projects/jetty-9.4.22.tpd" include "orbit/R20190827152740-2019-09.tpd" location "http://download.eclipse.org/releases/2018-09/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.21.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.21.tpd deleted file mode 100644 index 57ae873107..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.21.tpd +++ /dev/null @@ -1,20 +0,0 @@ -target "jetty-9.4.21" with source configurePhase - -location jetty-9.4.21 "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.21.v20190926/" { - org.eclipse.jetty.client [9.4.21.v20190926,9.4.21.v20190926] - org.eclipse.jetty.client.source [9.4.21.v20190926,9.4.21.v20190926] - org.eclipse.jetty.continuation [9.4.21.v20190926,9.4.21.v20190926] - org.eclipse.jetty.continuation.source [9.4.21.v20190926,9.4.21.v20190926] - org.eclipse.jetty.http [9.4.21.v20190926,9.4.21.v20190926] - org.eclipse.jetty.http.source [9.4.21.v20190926,9.4.21.v20190926] - org.eclipse.jetty.io [9.4.21.v20190926,9.4.21.v20190926] - org.eclipse.jetty.io.source [9.4.21.v20190926,9.4.21.v20190926] - org.eclipse.jetty.security [9.4.21.v20190926,9.4.21.v20190926] - org.eclipse.jetty.security.source [9.4.21.v20190926,9.4.21.v20190926] - org.eclipse.jetty.server [9.4.21.v20190926,9.4.21.v20190926] - org.eclipse.jetty.server.source [9.4.21.v20190926,9.4.21.v20190926] - org.eclipse.jetty.servlet [9.4.21.v20190926,9.4.21.v20190926] - org.eclipse.jetty.servlet.source [9.4.21.v20190926,9.4.21.v20190926] - org.eclipse.jetty.util [9.4.21.v20190926,9.4.21.v20190926] - org.eclipse.jetty.util.source [9.4.21.v20190926,9.4.21.v20190926] -} 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 new file mode 100644 index 0000000000..562e017d32 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.22.tpd @@ -0,0 +1,20 @@ +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/pom.xml b/pom.xml index 11c6ee18ed..0cedc52e84 100644 --- a/pom.xml +++ b/pom.xml @@ -193,7 +193,7 @@ 1.18 4.3.1 3.1.0 - 9.4.21.v20190926 + 9.4.22.v20191022 0.14.1 4.5.6 4.4.10 -- 2.39.5