Merge branch 'stable-4.6'

* stable-4.6:
  Update Jetty to 9.3.17.v20170317
  Revert "Update EGit 4.7 target platform to jetty 9.4.1"

Change-Id: I6f8017cfb2d0ef8e380fa3c11ffb3d024b3a5c09
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

9 files changed, 96 insertions, 76 deletions

diff --git a/org.eclipse.egit.target/egit-4.5.target b/org.eclipse.egit.target/egit-4.5.target
index 316a04dc43..a8c739dfbb 100644
--- a/org.eclipse.egit.target/egit-4.5.target
+++ b/org.eclipse.egit.target/egit-4.5.target
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="egit-4.5" sequenceNumber="1490204039">
+<target name="egit-4.5" sequenceNumber="1491140850">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.3.v20170317"/>
-      <repository id="jetty-9.4.3" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.3.v20170317/"/>
+      <unit id="org.eclipse.jetty.client" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.http" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.io" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.security" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.server" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.util" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.3.17.v20170317"/>
+      <repository id="jetty-9.3.17" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.3.17.v20170317/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.egit.target/egit-4.5.tpd b/org.eclipse.egit.target/egit-4.5.tpd
index c1cd546997..9b95b76205 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.3.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 ac9e9cfbd5..f800cb7560 100644
--- a/org.eclipse.egit.target/egit-4.6.target
+++ b/org.eclipse.egit.target/egit-4.6.target
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="egit-4.6" sequenceNumber="1490204033">
+<target name="egit-4.6" sequenceNumber="1491140844">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.3.v20170317"/>
-      <repository id="jetty-9.4.3" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.3.v20170317/"/>
+      <unit id="org.eclipse.jetty.client" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.http" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.io" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.security" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.server" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.util" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.3.17.v20170317"/>
+      <repository id="jetty-9.3.17" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.3.17.v20170317/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.egit.target/egit-4.6.tpd b/org.eclipse.egit.target/egit-4.6.tpd
index d47be83f8c..86d2718d60 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.3.tpd"
+include "projects/jetty-9.3.17.tpd"
 include "projects/swtbot-snapshot.tpd"
 include "projects/mylyn-latest.tpd"
 include "orbit/S20170306214312-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 41aaff5a1f..d9a5888ada 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 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="egit-4.7-staging" sequenceNumber="1490204027">
+<target name="egit-4.7-staging" sequenceNumber="1491140827">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.3.v20170317"/>
-      <repository id="jetty-9.4.3" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.3.v20170317/"/>
+      <unit id="org.eclipse.jetty.client" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.http" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.io" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.security" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.server" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.util" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.3.17.v20170317"/>
+      <repository id="jetty-9.3.17" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.3.17.v20170317/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.egit.target/egit-4.7-staging.tpd b/org.eclipse.egit.target/egit-4.7-staging.tpd
index 25833a1b71..d895fa17ea 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.3.tpd"
+include "projects/jetty-9.3.17.tpd"
 include "projects/swtbot-snapshot.tpd"
 include "projects/mylyn-latest.tpd"
 include "orbit/S20170306214312-Oxygen.tpd"
diff --git a/org.eclipse.egit.target/egit-4.7.target b/org.eclipse.egit.target/egit-4.7.target
index 1b89d6581a..cbd829350c 100644
--- a/org.eclipse.egit.target/egit-4.7.target
+++ b/org.eclipse.egit.target/egit-4.7.target
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="egit-4.7" sequenceNumber="1490204019">
+<target name="egit-4.7" sequenceNumber="1491140817">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.3.v20170317"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.3.v20170317"/>
-      <repository id="jetty-9.4.3" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.3.v20170317/"/>
+      <unit id="org.eclipse.jetty.client" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.http" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.io" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.security" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.server" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.util" version="9.3.17.v20170317"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.3.17.v20170317"/>
+      <repository id="jetty-9.3.17" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.3.17.v20170317/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.egit.target/egit-4.7.tpd b/org.eclipse.egit.target/egit-4.7.tpd
index 682903f7ae..4492939be0 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.3.tpd"
+include "projects/jetty-9.3.17.tpd"
 include "projects/swtbot-snapshot.tpd"
 include "projects/mylyn-latest.tpd"
 include "orbit/S20170306214312-Oxygen.tpd"
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]
+}