From c1044ab5092d5880ed214392df0c6933dfcf596e Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 31 Mar 2017 10:28:13 +0200 Subject: [PATCH] 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 721cd5318..d90b51554 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 0b65e6b95..8bffde73b 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 bf261466b..3ccf02408 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 bffee0263..6f59a4a92 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 34c0c7652..92bc8f64f 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 b36575f44..847fefd72 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 fdc9e3529..c555e0b47 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 0c562b3bc..de917635a 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 000000000..289a73d2a --- /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 33ff29dd4..000000000 --- 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] -} -- 2.11.4.GIT