From b31f966188697d2d07ac0e888d4b3c2a5defabb9 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 18 Aug 2018 19:16:58 +0200 Subject: [PATCH] Update Jetty to 9.4.11.v20180605 Change-Id: I1d2ad0536a0fd02361e17d0175eaeca2c047660c Signed-off-by: Matthias Sohn --- WORKSPACE | 26 +++++++------- .../org.eclipse.jgit.target/jgit-4.5.target | 36 +++++++++---------- .../org.eclipse.jgit.target/jgit-4.5.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 +- .../projects/jetty-9.4.11.tpd | 20 +++++++++++ .../projects/jetty-9.4.8.tpd | 20 ----------- pom.xml | 2 +- 12 files changed, 110 insertions(+), 110 deletions(-) create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.11.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.8.tpd diff --git a/WORKSPACE b/WORKSPACE index 0fff5f95a..e5ad51e23 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -111,46 +111,46 @@ maven_jar( sha1 = "3edcfe49d2c6053a70a2a47e4e1c2f94998a49cf", ) -JETTY_VER = "9.4.8.v20171121" +JETTY_VER = "9.4.11.v20180605" maven_jar( name = "jetty_servlet", artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VER, - sha1 = "bbbb9b5de08f468c7b9b3de6aea0b098d2c679b6", - src_sha1 = "6ef1e65a5af7ab2d79ba6043923affdaeaafb1e5", + sha1 = "66d31900fcfc70e3666f0b3335b6660635154f98", + src_sha1 = "930c50de49b9c258d5f0329426cbcac4d3143497", ) maven_jar( name = "jetty_security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER, - sha1 = "e8350eec683b55494287f06740543e4be6f75425", - src_sha1 = "e3a879d8675fa10bc305e7a59006f1d09db04a68", + sha1 = "926def86d31ee07ca4b4658833dc6ee6918b8e86", + src_sha1 = "019bc7c2a366cbb201950f24dd64d9d9a49b6840", ) maven_jar( name = "jetty_server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER, - sha1 = "34614bd9a29de57ef28ca31f1f2b49a412af196d", - src_sha1 = "fef49ac6b2bbc6d142dc0be34f68f0fb0792d52b", + sha1 = "58353c2f27515b007fc83ae22002feb34fc24714", + src_sha1 = "e7d832d74df616137755996b41bc28bb82b3bc42", ) maven_jar( name = "jetty_http", artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER, - sha1 = "9879d6c4e37400bf43f0cd4b3c6e34a3ba409864", - src_sha1 = "5e746cd0ccb732eef0427c8c4b9dcb034e26c61b", + sha1 = "20c35f5336befe35b0bd5c4a63e07170fe7872d7", + src_sha1 = "5bc30d1f7e8c4456c22cc85999b8cafd3741bdff", ) maven_jar( name = "jetty_io", artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER, - sha1 = "d3fe2dfa62f52ee91ff07cb359f63387e0e30b40", - src_sha1 = "41f25e1e1bba14ab0d3415488fa189f09c27a1cf", + sha1 = "d164de1dac18c4ca80a1b783d879c97449909c3b", + src_sha1 = "02c0caba292b1cb74cec1d36c6f91dc863c89b5a", ) maven_jar( name = "jetty_util", artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER, - sha1 = "d6ec1a1613c7fa72aa6bf5d8c204750afbc3df3b", - src_sha1 = "a74ecb43f96b2e21852f6908604316d7348a16ad", + sha1 = "f0f25aa2f27d618a04bc7356fa247ae4a05245b3", + src_sha1 = "4e5c4c483cfd9804c2fc5d5751866243bbb9d740", ) diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target index ad7c27c23..9ae9a2849 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target @@ -1,26 +1,26 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd index 3ad176d8f..dc27968ec 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd @@ -1,6 +1,6 @@ target "jgit-4.5" with source configurePhase -include "projects/jetty-9.4.8.tpd" +include "projects/jetty-9.4.11.tpd" include "orbit/S20180730183850-2018-09.tpd" location "http://download.eclipse.org/releases/mars/" { 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 9fec46b6c..6a6ea8d0a 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 fcc8ba296..4d4cf5a90 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.8.tpd" +include "projects/jetty-9.4.11.tpd" include "orbit/S20180730183850-2018-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 b6691af46..c271a1c89 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 2b04cbcf5..d946ecbea 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.8.tpd" +include "projects/jetty-9.4.11.tpd" include "orbit/S20180730183850-2018-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 7d6097a16..86342dde5 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 7c3392bd2..9c2d3f927 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.8.tpd" +include "projects/jetty-9.4.11.tpd" include "orbit/S20180730183850-2018-09.tpd" location "http://download.eclipse.org/releases/oxygen/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.11.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.11.tpd new file mode 100644 index 000000000..d2fd9017b --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.11.tpd @@ -0,0 +1,20 @@ +target "jetty-9.4.11" with source configurePhase + +location jetty-9.4.11 "http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.11.v20180605" { + org.eclipse.jetty.client [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.client.source [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.continuation [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.continuation.source [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.http [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.http.source [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.io [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.io.source [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.security [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.security.source [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.server [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.server.source [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.servlet [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.servlet.source [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.util [9.4.11.v20180605,9.4.11.v20180605] + org.eclipse.jetty.util.source [9.4.11.v20180605,9.4.11.v20180605] +} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.8.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.8.tpd deleted file mode 100644 index e37a06211..000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.8.tpd +++ /dev/null @@ -1,20 +0,0 @@ -target "jetty-9.4.8" with source configurePhase - -location jetty-9.4.8 "http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.8.v20171121" { - org.eclipse.jetty.client [9.4.8.v20171121,9.4.8.v20171121] - org.eclipse.jetty.client.source [9.4.8.v20171121,9.4.8.v20171121] - org.eclipse.jetty.continuation [9.4.8.v20171121,9.4.8.v20171121] - org.eclipse.jetty.continuation.source [9.4.8.v20171121,9.4.8.v20171121] - org.eclipse.jetty.http [9.4.8.v20171121,9.4.8.v20171121] - org.eclipse.jetty.http.source [9.4.8.v20171121,9.4.8.v20171121] - org.eclipse.jetty.io [9.4.8.v20171121,9.4.8.v20171121] - org.eclipse.jetty.io.source [9.4.8.v20171121,9.4.8.v20171121] - org.eclipse.jetty.security [9.4.8.v20171121,9.4.8.v20171121] - org.eclipse.jetty.security.source [9.4.8.v20171121,9.4.8.v20171121] - org.eclipse.jetty.server [9.4.8.v20171121,9.4.8.v20171121] - org.eclipse.jetty.server.source [9.4.8.v20171121,9.4.8.v20171121] - org.eclipse.jetty.servlet [9.4.8.v20171121,9.4.8.v20171121] - org.eclipse.jetty.servlet.source [9.4.8.v20171121,9.4.8.v20171121] - org.eclipse.jetty.util [9.4.8.v20171121,9.4.8.v20171121] - org.eclipse.jetty.util.source [9.4.8.v20171121,9.4.8.v20171121] -} diff --git a/pom.xml b/pom.xml index 37c22d67e..aee489536 100644 --- a/pom.xml +++ b/pom.xml @@ -207,7 +207,7 @@ 1.15 4.3.1 3.1.0 - 9.4.8.v20171121 + 9.4.11.v20180605 0.12.0 4.5.5 4.4.9