From c1044ab5092d5880ed214392df0c6933dfcf596e Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 31 Mar 2017 10:28:13 +0200 Subject: Revert "Update EGit 4.7 target platform to jetty 9.4.1" This reverts commit 4e83151ac6ce2f90598c2f42a4f212ce852b2d35. Change-Id: I6c01e4dcc5fa566ce7339ccdfa506b0c86a527c6 --- org.eclipse.egit.target/egit-4.5.target | 36 +++++++++++------------ org.eclipse.egit.target/egit-4.5.tpd | 2 +- org.eclipse.egit.target/egit-4.6.target | 36 +++++++++++------------ org.eclipse.egit.target/egit-4.6.tpd | 2 +- org.eclipse.egit.target/egit-4.7-staging.target | 36 +++++++++++------------ org.eclipse.egit.target/egit-4.7-staging.tpd | 2 +- org.eclipse.egit.target/egit-4.7.target | 36 +++++++++++------------ org.eclipse.egit.target/egit-4.7.tpd | 2 +- org.eclipse.egit.target/projects/jetty-9.2.13.tpd | 20 +++++++++++++ org.eclipse.egit.target/projects/jetty-9.4.1.tpd | 20 ------------- 10 files changed, 96 insertions(+), 96 deletions(-) create mode 100644 org.eclipse.egit.target/projects/jetty-9.2.13.tpd delete mode 100644 org.eclipse.egit.target/projects/jetty-9.4.1.tpd diff --git a/org.eclipse.egit.target/egit-4.5.target b/org.eclipse.egit.target/egit-4.5.target index 721cd53181..d90b515543 100644 --- a/org.eclipse.egit.target/egit-4.5.target +++ b/org.eclipse.egit.target/egit-4.5.target @@ -1,26 +1,26 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.target/egit-4.5.tpd b/org.eclipse.egit.target/egit-4.5.tpd index 0b65e6b95b..8bffde73b5 100644 --- a/org.eclipse.egit.target/egit-4.5.tpd +++ b/org.eclipse.egit.target/egit-4.5.tpd @@ -1,6 +1,6 @@ target "egit-4.5" with source configurePhase -include "projects/jetty-9.4.1.tpd" +include "projects/jetty-9.2.13.tpd" include "projects/swtbot-snapshot.tpd" include "projects/mylyn-latest.tpd" include "orbit/R20160221192158-Mars.tpd" diff --git a/org.eclipse.egit.target/egit-4.6.target b/org.eclipse.egit.target/egit-4.6.target index bf261466b4..3ccf02408c 100644 --- a/org.eclipse.egit.target/egit-4.6.target +++ b/org.eclipse.egit.target/egit-4.6.target @@ -1,26 +1,26 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.target/egit-4.6.tpd b/org.eclipse.egit.target/egit-4.6.tpd index bffee0263e..6f59a4a92a 100644 --- a/org.eclipse.egit.target/egit-4.6.tpd +++ b/org.eclipse.egit.target/egit-4.6.tpd @@ -1,6 +1,6 @@ target "egit-4.6" with source configurePhase -include "projects/jetty-9.4.1.tpd" +include "projects/jetty-9.2.13.tpd" include "projects/swtbot-snapshot.tpd" include "projects/mylyn-latest.tpd" include "orbit/S20170120205402-Oxygen.tpd" diff --git a/org.eclipse.egit.target/egit-4.7-staging.target b/org.eclipse.egit.target/egit-4.7-staging.target index 34c0c7652e..92bc8f64f8 100644 --- a/org.eclipse.egit.target/egit-4.7-staging.target +++ b/org.eclipse.egit.target/egit-4.7-staging.target @@ -1,26 +1,26 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.target/egit-4.7-staging.tpd b/org.eclipse.egit.target/egit-4.7-staging.tpd index b36575f44f..847fefd728 100644 --- a/org.eclipse.egit.target/egit-4.7-staging.tpd +++ b/org.eclipse.egit.target/egit-4.7-staging.tpd @@ -1,6 +1,6 @@ target "egit-4.7-staging" with source configurePhase -include "projects/jetty-9.4.1.tpd" +include "projects/jetty-9.2.13.tpd" include "projects/swtbot-snapshot.tpd" include "projects/mylyn-latest.tpd" include "orbit/S20170120205402-Oxygen.tpd" diff --git a/org.eclipse.egit.target/egit-4.7.target b/org.eclipse.egit.target/egit-4.7.target index fdc9e3529e..c555e0b47d 100644 --- a/org.eclipse.egit.target/egit-4.7.target +++ b/org.eclipse.egit.target/egit-4.7.target @@ -1,26 +1,26 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.target/egit-4.7.tpd b/org.eclipse.egit.target/egit-4.7.tpd index 0c562b3bcf..de917635a6 100644 --- a/org.eclipse.egit.target/egit-4.7.tpd +++ b/org.eclipse.egit.target/egit-4.7.tpd @@ -1,6 +1,6 @@ target "egit-4.7" with source configurePhase -include "projects/jetty-9.4.1.tpd" +include "projects/jetty-9.2.13.tpd" include "projects/swtbot-snapshot.tpd" include "projects/mylyn-latest.tpd" include "orbit/S20170120205402-Oxygen.tpd" diff --git a/org.eclipse.egit.target/projects/jetty-9.2.13.tpd b/org.eclipse.egit.target/projects/jetty-9.2.13.tpd new file mode 100644 index 0000000000..289a73d2ae --- /dev/null +++ b/org.eclipse.egit.target/projects/jetty-9.2.13.tpd @@ -0,0 +1,20 @@ +target "jetty-9.2.13" with source configurePhase + +location jetty-9.2.13 "http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.2.13.v20150730/" { + org.eclipse.jetty.client [9.2.13.v20150730,9.2.13.v20150730] + org.eclipse.jetty.client.source [9.2.13.v20150730,9.2.13.v20150730] + org.eclipse.jetty.continuation [9.2.13.v20150730,9.2.13.v20150730] + org.eclipse.jetty.continuation.source [9.2.13.v20150730,9.2.13.v20150730] + org.eclipse.jetty.http [9.2.13.v20150730,9.2.13.v20150730] + org.eclipse.jetty.http.source [9.2.13.v20150730,9.2.13.v20150730] + org.eclipse.jetty.io [9.2.13.v20150730,9.2.13.v20150730] + org.eclipse.jetty.io.source [9.2.13.v20150730,9.2.13.v20150730] + org.eclipse.jetty.security [9.2.13.v20150730,9.2.13.v20150730] + org.eclipse.jetty.security.source [9.2.13.v20150730,9.2.13.v20150730] + org.eclipse.jetty.server [9.2.13.v20150730,9.2.13.v20150730] + org.eclipse.jetty.server.source [9.2.13.v20150730,9.2.13.v20150730] + org.eclipse.jetty.servlet [9.2.13.v20150730,9.2.13.v20150730] + org.eclipse.jetty.servlet.source [9.2.13.v20150730,9.2.13.v20150730] + org.eclipse.jetty.util [9.2.13.v20150730,9.2.13.v20150730] + org.eclipse.jetty.util.source [9.2.13.v20150730,9.2.13.v20150730] +} diff --git a/org.eclipse.egit.target/projects/jetty-9.4.1.tpd b/org.eclipse.egit.target/projects/jetty-9.4.1.tpd deleted file mode 100644 index 33ff29dd47..0000000000 --- a/org.eclipse.egit.target/projects/jetty-9.4.1.tpd +++ /dev/null @@ -1,20 +0,0 @@ -target "jetty-9.4.1" with source configurePhase - -location jetty-9.4.1 "http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.1.v20170120/" { - org.eclipse.jetty.client [9.4.1.v20170120,9.4.1.v20170120] - org.eclipse.jetty.client.source [9.4.1.v20170120,9.4.1.v20170120] - org.eclipse.jetty.continuation [9.4.1.v20170120,9.4.1.v20170120] - org.eclipse.jetty.continuation.source [9.4.1.v20170120,9.4.1.v20170120] - org.eclipse.jetty.http [9.4.1.v20170120,9.4.1.v20170120] - org.eclipse.jetty.http.source [9.4.1.v20170120,9.4.1.v20170120] - org.eclipse.jetty.io [9.4.1.v20170120,9.4.1.v20170120] - org.eclipse.jetty.io.source [9.4.1.v20170120,9.4.1.v20170120] - org.eclipse.jetty.security [9.4.1.v20170120,9.4.1.v20170120] - org.eclipse.jetty.security.source [9.4.1.v20170120,9.4.1.v20170120] - org.eclipse.jetty.server [9.4.1.v20170120,9.4.1.v20170120] - org.eclipse.jetty.server.source [9.4.1.v20170120,9.4.1.v20170120] - org.eclipse.jetty.servlet [9.4.1.v20170120,9.4.1.v20170120] - org.eclipse.jetty.servlet.source [9.4.1.v20170120,9.4.1.v20170120] - org.eclipse.jetty.util [9.4.1.v20170120,9.4.1.v20170120] - org.eclipse.jetty.util.source [9.4.1.v20170120,9.4.1.v20170120] -} -- cgit v1.2.3 From 2f25f00d06ac3f31eb690a0cac77235d6dd56b17 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 1 Apr 2017 13:01:18 +0200 Subject: Update Jetty to 9.3.17.v20170317 Update to the latest 9.3 version until we have a solution for bug 514336 we face with 9.4.x versions. Change-Id: I243d3a76278b339792fe9246cd89a8c5cd4d70a8 Signed-off-by: Matthias Sohn --- org.eclipse.egit.target/egit-4.5.target | 36 +++++++++++------------ org.eclipse.egit.target/egit-4.5.tpd | 2 +- org.eclipse.egit.target/egit-4.6.target | 36 +++++++++++------------ org.eclipse.egit.target/egit-4.6.tpd | 2 +- org.eclipse.egit.target/egit-4.7-staging.target | 36 +++++++++++------------ org.eclipse.egit.target/egit-4.7-staging.tpd | 2 +- org.eclipse.egit.target/egit-4.7.target | 36 +++++++++++------------ org.eclipse.egit.target/egit-4.7.tpd | 2 +- org.eclipse.egit.target/projects/jetty-9.2.13.tpd | 20 ------------- org.eclipse.egit.target/projects/jetty-9.3.17.tpd | 20 +++++++++++++ 10 files changed, 96 insertions(+), 96 deletions(-) delete mode 100644 org.eclipse.egit.target/projects/jetty-9.2.13.tpd create mode 100644 org.eclipse.egit.target/projects/jetty-9.3.17.tpd diff --git a/org.eclipse.egit.target/egit-4.5.target b/org.eclipse.egit.target/egit-4.5.target index d90b515543..39d0aaaa9c 100644 --- a/org.eclipse.egit.target/egit-4.5.target +++ b/org.eclipse.egit.target/egit-4.5.target @@ -1,26 +1,26 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.target/egit-4.5.tpd b/org.eclipse.egit.target/egit-4.5.tpd index 8bffde73b5..a876f3fbb1 100644 --- a/org.eclipse.egit.target/egit-4.5.tpd +++ b/org.eclipse.egit.target/egit-4.5.tpd @@ -1,6 +1,6 @@ target "egit-4.5" with source configurePhase -include "projects/jetty-9.2.13.tpd" +include "projects/jetty-9.3.17.tpd" include "projects/swtbot-snapshot.tpd" include "projects/mylyn-latest.tpd" include "orbit/R20160221192158-Mars.tpd" diff --git a/org.eclipse.egit.target/egit-4.6.target b/org.eclipse.egit.target/egit-4.6.target index 3ccf02408c..130a818bcd 100644 --- a/org.eclipse.egit.target/egit-4.6.target +++ b/org.eclipse.egit.target/egit-4.6.target @@ -1,26 +1,26 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.target/egit-4.6.tpd b/org.eclipse.egit.target/egit-4.6.tpd index 6f59a4a92a..129b4cc8d0 100644 --- a/org.eclipse.egit.target/egit-4.6.tpd +++ b/org.eclipse.egit.target/egit-4.6.tpd @@ -1,6 +1,6 @@ target "egit-4.6" with source configurePhase -include "projects/jetty-9.2.13.tpd" +include "projects/jetty-9.3.17.tpd" include "projects/swtbot-snapshot.tpd" include "projects/mylyn-latest.tpd" include "orbit/S20170120205402-Oxygen.tpd" diff --git a/org.eclipse.egit.target/egit-4.7-staging.target b/org.eclipse.egit.target/egit-4.7-staging.target index 92bc8f64f8..9a813e47c9 100644 --- a/org.eclipse.egit.target/egit-4.7-staging.target +++ b/org.eclipse.egit.target/egit-4.7-staging.target @@ -1,26 +1,26 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.target/egit-4.7-staging.tpd b/org.eclipse.egit.target/egit-4.7-staging.tpd index 847fefd728..049d6da0d7 100644 --- a/org.eclipse.egit.target/egit-4.7-staging.tpd +++ b/org.eclipse.egit.target/egit-4.7-staging.tpd @@ -1,6 +1,6 @@ target "egit-4.7-staging" with source configurePhase -include "projects/jetty-9.2.13.tpd" +include "projects/jetty-9.3.17.tpd" include "projects/swtbot-snapshot.tpd" include "projects/mylyn-latest.tpd" include "orbit/S20170120205402-Oxygen.tpd" diff --git a/org.eclipse.egit.target/egit-4.7.target b/org.eclipse.egit.target/egit-4.7.target index c555e0b47d..4f3013ef8f 100644 --- a/org.eclipse.egit.target/egit-4.7.target +++ b/org.eclipse.egit.target/egit-4.7.target @@ -1,26 +1,26 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.target/egit-4.7.tpd b/org.eclipse.egit.target/egit-4.7.tpd index de917635a6..2de6d89bcd 100644 --- a/org.eclipse.egit.target/egit-4.7.tpd +++ b/org.eclipse.egit.target/egit-4.7.tpd @@ -1,6 +1,6 @@ target "egit-4.7" with source configurePhase -include "projects/jetty-9.2.13.tpd" +include "projects/jetty-9.3.17.tpd" include "projects/swtbot-snapshot.tpd" include "projects/mylyn-latest.tpd" include "orbit/S20170120205402-Oxygen.tpd" diff --git a/org.eclipse.egit.target/projects/jetty-9.2.13.tpd b/org.eclipse.egit.target/projects/jetty-9.2.13.tpd deleted file mode 100644 index 289a73d2ae..0000000000 --- a/org.eclipse.egit.target/projects/jetty-9.2.13.tpd +++ /dev/null @@ -1,20 +0,0 @@ -target "jetty-9.2.13" with source configurePhase - -location jetty-9.2.13 "http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.2.13.v20150730/" { - org.eclipse.jetty.client [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.client.source [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.continuation [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.continuation.source [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.http [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.http.source [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.io [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.io.source [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.security [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.security.source [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.server [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.server.source [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.servlet [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.servlet.source [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.util [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.util.source [9.2.13.v20150730,9.2.13.v20150730] -} diff --git a/org.eclipse.egit.target/projects/jetty-9.3.17.tpd b/org.eclipse.egit.target/projects/jetty-9.3.17.tpd new file mode 100644 index 0000000000..662df09f77 --- /dev/null +++ b/org.eclipse.egit.target/projects/jetty-9.3.17.tpd @@ -0,0 +1,20 @@ +target "jetty-9.3.17" with source configurePhase + +location jetty-9.3.17 "http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.3.17.v20170317/" { + org.eclipse.jetty.client [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.client.source [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.continuation [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.continuation.source [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.http [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.http.source [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.io [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.io.source [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.security [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.security.source [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.server [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.server.source [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.servlet [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.servlet.source [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.util [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.util.source [9.3.17.v20170317,9.3.17.v20170317] +} -- cgit v1.2.3