From: Matthias Sohn Date: Fri, 4 Oct 2019 20:21:35 +0000 (+0200) Subject: Update Jetty to 9.4.21.v20190926 X-Git-Tag: v5.6.0.201911271000-m3~95 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d0adf52df8ac83c8d5f49e3eddafb95b51a42fbc;p=jgit.git Update Jetty to 9.4.21.v20190926 Change-Id: If01a01015024db9743c38c59f920964b3c3a0539 Signed-off-by: Matthias Sohn --- diff --git a/WORKSPACE b/WORKSPACE index 9f707d872a..ea674f4136 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -173,48 +173,48 @@ maven_jar( sha1 = "3edcfe49d2c6053a70a2a47e4e1c2f94998a49cf", ) -JETTY_VER = "9.4.20.v20190813" +JETTY_VER = "9.4.21.v20190926" maven_jar( name = "jetty-servlet", artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VER, - sha1 = "d5d6610321bd173aead473e994f170989d633b25", - src_sha1 = "09aa4fce2579d0905e3bde0b3bc923a032394805", + sha1 = "b8b319531d4aa26049cdfc2a8d3431219b9d19aa", + src_sha1 = "1fa9afededcb9370dd750994581c71a891099d84", ) maven_jar( name = "jetty-security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER, - sha1 = "300c2e6dd62291c512bdaf3ecfefc1e305e26088", - src_sha1 = "ec03ce3b6a8c0c3dd2bd8b32bc51419caa10ad62", + sha1 = "6226803d9f2198acebeba984a910f7a62c1df2da", + src_sha1 = "37aabc7ce483171e62afb0ec3202cdfde99ed2dc", ) maven_jar( name = "jetty-server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER, - sha1 = "d4ee11134bca83db85919a1710fce022c67df3b7", - src_sha1 = "0db81f86709a8184c793acd309c27dccdb5d439c", + sha1 = "7ada02c441d06602587eeacce7a9693160a20f3e", + src_sha1 = "d02a3241203f14e8c08a5e6a09bb51bd34c9a57d", ) maven_jar( name = "jetty-http", artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER, - sha1 = "edda2fd904a881114aba79e2f881c6f4004e8148", - src_sha1 = "3e187c60d578c529f4baa3bbfc727d4b7ca7b93c", + sha1 = "cc59f5acae2ed66c209de484ac4d3d2086eaa4d7", + src_sha1 = "7cd581962f6e5b224b932a39d0214e3dcce6992e", ) maven_jar( name = "jetty-io", artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER, - sha1 = "b246c5e350d0aa1b310c07ec362755c34a1cc8cb", - src_sha1 = "d12619b4df0d202847096a8429b0f96f123c7c77", + sha1 = "9a65da60b050fc65212cb8e2dd3fba1f300b2141", + src_sha1 = "02700a970340b42932d91b6bc3bac6963159c160", ) maven_jar( name = "jetty-util", artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER, - sha1 = "8ee753d673a124ba2880361871ab13f6863b2d40", - src_sha1 = "2827925d01d95f42d02adf177d2474fbc8a3d5e0", + sha1 = "72a5fc3be9f0994270599a6e0b829f8a3f554066", + src_sha1 = "7a3827c0fa323def8fcc84af97124e42e3f387e1", ) 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 771682c415..d8336b7ae1 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 e5fce09c0e..54cd636f92 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.20.tpd" +include "projects/jetty-9.4.21.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 2466f8995e..e3ce7ea9b8 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 09d29c0d43..71ee882beb 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.20.tpd" +include "projects/jetty-9.4.21.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 4f06536f12..7f9def6cb8 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 3286f77aab..3a58b6925e 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.20.tpd" +include "projects/jetty-9.4.21.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 3531cce5d3..d506dc4a0c 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 a9f5490134..f8f685a87a 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.20.tpd" +include "projects/jetty-9.4.21.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 7829b55c48..641e9f8835 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 201d0b3c1b..1c266853c2 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.20.tpd" +include "projects/jetty-9.4.21.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 e8044e4ed5..542a882734 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 edc1983e29..373d3168e6 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.20.tpd" +include "projects/jetty-9.4.21.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 8c6b45bc4e..59ca861464 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 56cb3e9005..e90a4a44f5 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.20.tpd" +include "projects/jetty-9.4.21.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 f3d8876219..25b53df6bd 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 9a9b5572a4..ad4473b847 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.20.tpd" +include "projects/jetty-9.4.21.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 4a6d011e9c..b5d1f13189 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 8874e2e6b0..5dce713896 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.20.tpd" +include "projects/jetty-9.4.21.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.20.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.20.tpd deleted file mode 100644 index b29179a8ec..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.20.tpd +++ /dev/null @@ -1,20 +0,0 @@ -target "jetty-9.4.20" with source configurePhase - -location jetty-9.4.20 "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.20.v20190813/" { - org.eclipse.jetty.client [9.4.20.v20190813,9.4.20.v20190813] - org.eclipse.jetty.client.source [9.4.20.v20190813,9.4.20.v20190813] - org.eclipse.jetty.continuation [9.4.20.v20190813,9.4.20.v20190813] - org.eclipse.jetty.continuation.source [9.4.20.v20190813,9.4.20.v20190813] - org.eclipse.jetty.http [9.4.20.v20190813,9.4.20.v20190813] - org.eclipse.jetty.http.source [9.4.20.v20190813,9.4.20.v20190813] - org.eclipse.jetty.io [9.4.20.v20190813,9.4.20.v20190813] - org.eclipse.jetty.io.source [9.4.20.v20190813,9.4.20.v20190813] - org.eclipse.jetty.security [9.4.20.v20190813,9.4.20.v20190813] - org.eclipse.jetty.security.source [9.4.20.v20190813,9.4.20.v20190813] - org.eclipse.jetty.server [9.4.20.v20190813,9.4.20.v20190813] - org.eclipse.jetty.server.source [9.4.20.v20190813,9.4.20.v20190813] - org.eclipse.jetty.servlet [9.4.20.v20190813,9.4.20.v20190813] - org.eclipse.jetty.servlet.source [9.4.20.v20190813,9.4.20.v20190813] - org.eclipse.jetty.util [9.4.20.v20190813,9.4.20.v20190813] - org.eclipse.jetty.util.source [9.4.20.v20190813,9.4.20.v20190813] -} 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 new file mode 100644 index 0000000000..57ae873107 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.21.tpd @@ -0,0 +1,20 @@ +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/pom.xml b/pom.xml index 5c812d6250..c138e3225a 100644 --- a/pom.xml +++ b/pom.xml @@ -193,7 +193,7 @@ 1.18 4.3.1 3.1.0 - 9.4.20.v20190813 + 9.4.21.v20190926 0.14.1 4.5.6 4.4.10