From 0652b5b213b03a0f891b65f093bbf5fa488a241c Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 15 Jan 2020 16:14:17 +0100 Subject: [PATCH] Upgrade jetty to 9.4.25.v20191220 Change-Id: I6a14c2beec3075eac5807cd639f55f38ae8c9c49 Signed-off-by: Matthias Sohn --- .../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.24.tpd | 20 ----------- .../projects/jetty-9.4.x.tpd | 20 +++++++++++ pom.xml | 2 +- 21 files changed, 192 insertions(+), 192 deletions(-) delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.24.tpd create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.x.tpd 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 c5d34634b..3cfe1b395 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 ea97f6aac..19ebf13e3 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.24.tpd" +include "projects/jetty-9.4.x.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 975ef7735..b42ae5758 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 349df838f..b54e1771b 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.24.tpd" +include "projects/jetty-9.4.x.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 5d276c5e8..3b27528c3 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 8d3243700..fe5a8d63b 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.24.tpd" +include "projects/jetty-9.4.x.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 d938753a6..c87f25d3f 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 0603b4087..caeae9c60 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.24.tpd" +include "projects/jetty-9.4.x.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 09a3b187b..92e67946a 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 bb6dcc7ec..0b61b90d0 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.24.tpd" +include "projects/jetty-9.4.x.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 257b8aeea..c77b6fca6 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 a62b26d2a..895f37c6c 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.24.tpd" +include "projects/jetty-9.4.x.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 daacb72cd..5fbe5e980 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 4a9e428b6..19a733b3f 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.24.tpd" +include "projects/jetty-9.4.x.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 624c2df77..c4c5799f5 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 ca672b7bb..1aad52ad4 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.24.tpd" +include "projects/jetty-9.4.x.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 2c30d8a74..de451fd6a 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 c7a832173..9ab5a5921 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.24.tpd" +include "projects/jetty-9.4.x.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.24.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.24.tpd deleted file mode 100644 index 7b2af0238..000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.24.tpd +++ /dev/null @@ -1,20 +0,0 @@ -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/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.x.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.x.tpd new file mode 100644 index 000000000..fb9bb2d00 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.x.tpd @@ -0,0 +1,20 @@ +target "jetty-9.4.x" with source configurePhase + +location jetty-9.4.25 "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.25.v20191220/" { + org.eclipse.jetty.client [9.4.25.v20191220,9.4.25.v20191220] + org.eclipse.jetty.client.source [9.4.25.v20191220,9.4.25.v20191220] + org.eclipse.jetty.continuation [9.4.25.v20191220,9.4.25.v20191220] + org.eclipse.jetty.continuation.source [9.4.25.v20191220,9.4.25.v20191220] + org.eclipse.jetty.http [9.4.25.v20191220,9.4.25.v20191220] + org.eclipse.jetty.http.source [9.4.25.v20191220,9.4.25.v20191220] + org.eclipse.jetty.io [9.4.25.v20191220,9.4.25.v20191220] + org.eclipse.jetty.io.source [9.4.25.v20191220,9.4.25.v20191220] + org.eclipse.jetty.security [9.4.25.v20191220,9.4.25.v20191220] + org.eclipse.jetty.security.source [9.4.25.v20191220,9.4.25.v20191220] + org.eclipse.jetty.server [9.4.25.v20191220,9.4.25.v20191220] + org.eclipse.jetty.server.source [9.4.25.v20191220,9.4.25.v20191220] + org.eclipse.jetty.servlet [9.4.25.v20191220,9.4.25.v20191220] + org.eclipse.jetty.servlet.source [9.4.25.v20191220,9.4.25.v20191220] + org.eclipse.jetty.util [9.4.25.v20191220,9.4.25.v20191220] + org.eclipse.jetty.util.source [9.4.25.v20191220,9.4.25.v20191220] +} diff --git a/pom.xml b/pom.xml index cde7c6d6f..2eeda672d 100644 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,7 @@ 1.18 4.3.1 3.1.0 - 9.4.24.v20191120 + 9.4.25.v20191220 0.14.1 4.5.6 4.4.10