From cb208fb3ca130a2241bef3f3a33d54269d3a14ba Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 26 Aug 2019 00:46:22 +0200 Subject: [PATCH] Update Jetty to 9.4.20.v20190813 Bug: 550094 Change-Id: I2148f5ff7e60450dc7e023257560e2a77ce5c85a 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 +- .../jgit-4.13-staging.target | 36 +++++++++---------- .../jgit-4.13-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.14.tpd | 20 ----------- .../projects/jetty-9.4.20.tpd | 20 +++++++++++ pom.xml | 2 +- 20 files changed, 186 insertions(+), 186 deletions(-) delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.14.tpd create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.20.tpd diff --git a/WORKSPACE b/WORKSPACE index 9fb3eedef6..97bf81e27f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -168,48 +168,48 @@ maven_jar( sha1 = "3edcfe49d2c6053a70a2a47e4e1c2f94998a49cf", ) -JETTY_VER = "9.4.14.v20181114" +JETTY_VER = "9.4.20.v20190813" maven_jar( name = "jetty-servlet", artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VER, - sha1 = "96f501462af425190ff7b63e387692c1aa3af2c8", - src_sha1 = "204b8a84adf3ce354138509c42638b5b2d223d1f", + sha1 = "d5d6610321bd173aead473e994f170989d633b25", + src_sha1 = "09aa4fce2579d0905e3bde0b3bc923a032394805", ) maven_jar( name = "jetty-security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER, - sha1 = "6cbeb2fe9b3cc4f88a7ea040b8a0c4f703cd72ce", - src_sha1 = "33555125c5988fca12273f60a0aa545d848de54a", + sha1 = "300c2e6dd62291c512bdaf3ecfefc1e305e26088", + src_sha1 = "ec03ce3b6a8c0c3dd2bd8b32bc51419caa10ad62", ) maven_jar( name = "jetty-server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER, - sha1 = "b36a3d52d78a1df6406f6fa236a6eeff48cbfef6", - src_sha1 = "55db20ea68c9c1b0ed264d80e7d75b4988da87a6", + sha1 = "d4ee11134bca83db85919a1710fce022c67df3b7", + src_sha1 = "0db81f86709a8184c793acd309c27dccdb5d439c", ) maven_jar( name = "jetty-http", artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER, - sha1 = "6d0c8ac42e9894ae7b5032438eb4579c2a47f4fe", - src_sha1 = "3c4f8a942909cabe6d029f835c185207eb91af75", + sha1 = "edda2fd904a881114aba79e2f881c6f4004e8148", + src_sha1 = "3e187c60d578c529f4baa3bbfc727d4b7ca7b93c", ) maven_jar( name = "jetty-io", artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER, - sha1 = "a8c6a705ddb9f83a75777d89b0be59fcef3f7637", - src_sha1 = "06132108ccabbe181707af911e5a68fd8e8806ff", + sha1 = "b246c5e350d0aa1b310c07ec362755c34a1cc8cb", + src_sha1 = "d12619b4df0d202847096a8429b0f96f123c7c77", ) maven_jar( name = "jetty-util", artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER, - sha1 = "5bb3d7a38f7ea54138336591d89dd5867b806c02", - src_sha1 = "94e89a8c9f82e38555e95b9f7f58344a247e862c", + sha1 = "8ee753d673a124ba2880361871ab13f6863b2d40", + src_sha1 = "2827925d01d95f42d02adf177d2474fbc8a3d5e0", ) 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 61c71904ea..8a4b150791 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 7a03e55965..853ecd06ef 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.14.tpd" +include "projects/jetty-9.4.20.tpd" include "orbit/S20190819183153.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 28b6bad14b..f53e60bd68 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 ca457aea3e..8bf9700330 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.14.tpd" +include "projects/jetty-9.4.20.tpd" include "orbit/S20190819183153.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 fa6296b793..9609e3672c 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 37d737283d..b4f7690f70 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.14.tpd" +include "projects/jetty-9.4.20.tpd" include "orbit/S20190819183153.tpd" location "http://download.eclipse.org/releases/2019-06/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13-staging.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13-staging.target index a3dbe99fbc..d89a202c3a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13-staging.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13-staging.target @@ -1,26 +1,26 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13-staging.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13-staging.tpd index 73e71ce565..60aa8f3616 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13-staging.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13-staging.tpd @@ -1,6 +1,6 @@ target "jgit-4.13-staging" with source configurePhase -include "projects/jetty-9.4.14.tpd" +include "projects/jetty-9.4.20.tpd" include "orbit/S20190819183153.tpd" location "http://download.eclipse.org/staging/2019-09/" { 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 382dfe552e..e6c6ea9569 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 1652112e53..1270b86714 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.14.tpd" +include "projects/jetty-9.4.20.tpd" include "orbit/S20190819183153.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 9b70718f43..60087e74c6 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 6e256577a2..4f7d9739ad 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.14.tpd" +include "projects/jetty-9.4.20.tpd" include "orbit/S20190819183153.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 085bc485c3..50d1b24b47 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 0a54f3290b..580ea01184 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.14.tpd" +include "projects/jetty-9.4.20.tpd" include "orbit/S20190819183153.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 7ca3470169..bdef7fe0ee 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 e5c924f37d..3f4c485cb5 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.14.tpd" +include "projects/jetty-9.4.20.tpd" include "orbit/S20190819183153.tpd" location "http://download.eclipse.org/releases/2018-09/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.14.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.14.tpd deleted file mode 100644 index 5372e77e5a..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.14.tpd +++ /dev/null @@ -1,20 +0,0 @@ -target "jetty-9.4.14" with source configurePhase - -location jetty-9.4.14 "http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.14.v20181114" { - org.eclipse.jetty.client [9.4.14.v20181114,9.4.14.v20181114] - org.eclipse.jetty.client.source [9.4.14.v20181114,9.4.14.v20181114] - org.eclipse.jetty.continuation [9.4.14.v20181114,9.4.14.v20181114] - org.eclipse.jetty.continuation.source [9.4.14.v20181114,9.4.14.v20181114] - org.eclipse.jetty.http [9.4.14.v20181114,9.4.14.v20181114] - org.eclipse.jetty.http.source [9.4.14.v20181114,9.4.14.v20181114] - org.eclipse.jetty.io [9.4.14.v20181114,9.4.14.v20181114] - org.eclipse.jetty.io.source [9.4.14.v20181114,9.4.14.v20181114] - org.eclipse.jetty.security [9.4.14.v20181114,9.4.14.v20181114] - org.eclipse.jetty.security.source [9.4.14.v20181114,9.4.14.v20181114] - org.eclipse.jetty.server [9.4.14.v20181114,9.4.14.v20181114] - org.eclipse.jetty.server.source [9.4.14.v20181114,9.4.14.v20181114] - org.eclipse.jetty.servlet [9.4.14.v20181114,9.4.14.v20181114] - org.eclipse.jetty.servlet.source [9.4.14.v20181114,9.4.14.v20181114] - org.eclipse.jetty.util [9.4.14.v20181114,9.4.14.v20181114] - org.eclipse.jetty.util.source [9.4.14.v20181114,9.4.14.v20181114] -} 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 new file mode 100644 index 0000000000..b29179a8ec --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.20.tpd @@ -0,0 +1,20 @@ +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/pom.xml b/pom.xml index c7cc892ea2..ffef61cc6f 100644 --- a/pom.xml +++ b/pom.xml @@ -193,7 +193,7 @@ 1.18 4.3.1 3.1.0 - 9.4.14.v20181114 + 9.4.20.v20190813 0.14.1 4.5.6 4.4.10 -- 2.39.5