From 94accd719aa0532218babef269c7150a301b41ff Mon Sep 17 00:00:00 2001
From: Matthias Sohn <matthias.sohn@sap.com>
Date: Fri, 31 Mar 2017 00:34:57 +0200
Subject: [PATCH] Downgrade jetty to 9.3.9.v20160517

This works around the problems we faced with jetty 9.4.3.v20170317.

Bug: 514336
Change-Id: I7e9dd539414624d71587c55cb436b843949aa296
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---
 .../META-INF/MANIFEST.MF                      | 28 +++++++--------
 .../META-INF/MANIFEST.MF                      | 20 +++++------
 .../META-INF/MANIFEST.MF                      | 28 +++++++--------
 .../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 +-
 .../projects/jetty-9.3.9.tpd                  | 20 +++++++++++
 .../projects/jetty-9.4.3.tpd                  | 20 -----------
 org.eclipse.jgit.pgm/META-INF/MANIFEST.MF     | 28 +++++++--------
 12 files changed, 129 insertions(+), 129 deletions(-)
 create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.3.9.tpd
 delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.3.tpd

diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index 11a5d14df..8435fb67d 100644
--- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
@@ -8,20 +8,20 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
  javax.servlet.http;version="[2.5.0,3.2.0)",
- org.eclipse.jetty.continuation;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.http;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.io;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.security;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.security.authentication;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.server;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.server.handler;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.server.nio;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.servlet;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util.component;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util.log;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util.security;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util.thread;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.continuation;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.http;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.io;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.security;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.security.authentication;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.server;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.server.handler;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.server.nio;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.servlet;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.util;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.util.component;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.util.log;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.util.security;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.util.thread;version="[9.3.0,10.0.0)",
  org.eclipse.jgit.errors;version="[4.7.0,4.8.0)",
  org.eclipse.jgit.http.server;version="[4.7.0,4.8.0)",
  org.eclipse.jgit.http.server.glue;version="[4.7.0,4.8.0)",
diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
index c27b64216..836ab8a2c 100644
--- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
@@ -10,16 +10,16 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
  javax.servlet.http;version="[2.5.0,3.2.0)",
  org.apache.commons.logging;version="[1.1.1,2.0.0)",
- org.eclipse.jetty.http;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.security;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.security.authentication;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.server;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.server.handler;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.server.nio;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.servlet;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util.component;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util.log;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util.security;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.http;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.security;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.security.authentication;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.server;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.server.handler;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.server.nio;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.servlet;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.util.component;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.util.log;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.util.security;version="[9.3.0,10.0.0)",
  org.eclipse.jgit.errors;version="[4.7.0,4.8.0)",
  org.eclipse.jgit.http.server;version="[4.7.0,4.8.0)",
  org.eclipse.jgit.internal.storage.file;version="[4.7.0,4.8.0)",
diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
index a37f51a83..508f754aa 100644
--- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
@@ -13,20 +13,20 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
  org.apache.http.client.methods;version="[4.3.0,5.0.0)",
  org.apache.http.entity;version="[4.3.0,5.0.0)",
  org.apache.http.impl.client;version="[4.3.0,5.0.0)",
- org.eclipse.jetty.continuation;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.http;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.io;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.security;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.security.authentication;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.server;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.server.handler;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.server.nio;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.servlet;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util.component;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util.log;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util.security;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util.thread;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.continuation;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.http;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.io;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.security;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.security.authentication;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.server;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.server.handler;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.server.nio;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.servlet;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.util;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.util.component;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.util.log;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.util.security;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.util.thread;version="[9.3.0,10.0.0)",
  org.eclipse.jgit.junit.http;version="[4.7.0,4.8.0)",
  org.eclipse.jgit.lfs.lib;version="[4.7.0,4.8.0)",
  org.eclipse.jgit.lfs.server.fs;version="[4.7.0,4.8.0)",
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 fa252c5f9..5227e1d86 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 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="jgit-4.5" sequenceNumber="1490203927">
+<target name="jgit-4.5" sequenceNumber="1490913405">
   <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.9.v20160517"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.http" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.io" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.security" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.server" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.util" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.3.9.v20160517"/>
+      <repository id="jetty-9.4.3" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.3.9.v20160517/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.apache.ant" version="1.9.4.v201504302020"/>
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 625e5c68e..d73f848f2 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.3.tpd"
+include "projects/jetty-9.3.9.tpd"
 include "orbit/R20160221192158-Mars.tpd"
 include "orbit/S20170306214312-Oxygen.tpd"
 
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 fe963f9f7..9760157c0 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 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="jgit-4.6" sequenceNumber="1490203817">
+<target name="jgit-4.6" sequenceNumber="1490913387">
   <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.9.v20160517"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.http" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.io" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.security" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.server" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.util" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.3.9.v20160517"/>
+      <repository id="jetty-9.4.3" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.3.9.v20160517/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.apache.ant" version="1.9.6.v201510161327"/>
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 3793dc623..ed3e840fb 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.3.tpd"
+include "projects/jetty-9.3.9.tpd"
 include "orbit/S20170306214312-Oxygen.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 97af78f85..0eba32fbb 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 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="jgit-4.7" sequenceNumber="1490203803">
+<target name="jgit-4.7" sequenceNumber="1490913364">
   <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.9.v20160517"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.http" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.io" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.security" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.server" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.util" version="9.3.9.v20160517"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.3.9.v20160517"/>
+      <repository id="jetty-9.4.3" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.3.9.v20160517/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.apache.ant" version="1.9.6.v201510161327"/>
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 586576406..d99c74a4b 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.3.tpd"
+include "projects/jetty-9.3.9.tpd"
 include "orbit/S20170306214312-Oxygen.tpd"
 
 location "http://download.eclipse.org/releases/oxygen/" {
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.3.9.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.3.9.tpd
new file mode 100644
index 000000000..d5621a07e
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.3.9.tpd
@@ -0,0 +1,20 @@
+target "jetty-9.4.3" with source configurePhase
+
+location jetty-9.4.3 "http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.3.9.v20160517/" {
+	org.eclipse.jetty.client [9.3.9.v20160517,9.3.9.v20160517]
+	org.eclipse.jetty.client.source [9.3.9.v20160517,9.3.9.v20160517]
+	org.eclipse.jetty.continuation [9.3.9.v20160517,9.3.9.v20160517]
+	org.eclipse.jetty.continuation.source [9.3.9.v20160517,9.3.9.v20160517]
+	org.eclipse.jetty.http [9.3.9.v20160517,9.3.9.v20160517]
+	org.eclipse.jetty.http.source [9.3.9.v20160517,9.3.9.v20160517]
+	org.eclipse.jetty.io [9.3.9.v20160517,9.3.9.v20160517]
+	org.eclipse.jetty.io.source [9.3.9.v20160517,9.3.9.v20160517]
+	org.eclipse.jetty.security [9.3.9.v20160517,9.3.9.v20160517]
+	org.eclipse.jetty.security.source [9.3.9.v20160517,9.3.9.v20160517]
+	org.eclipse.jetty.server [9.3.9.v20160517,9.3.9.v20160517]
+	org.eclipse.jetty.server.source [9.3.9.v20160517,9.3.9.v20160517]
+	org.eclipse.jetty.servlet [9.3.9.v20160517,9.3.9.v20160517]
+	org.eclipse.jetty.servlet.source [9.3.9.v20160517,9.3.9.v20160517]
+	org.eclipse.jetty.util [9.3.9.v20160517,9.3.9.v20160517]
+	org.eclipse.jetty.util.source [9.3.9.v20160517,9.3.9.v20160517]
+}
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.3.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.3.tpd
deleted file mode 100644
index d545d8092..000000000
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.3.tpd
+++ /dev/null
@@ -1,20 +0,0 @@
-target "jetty-9.4.3" with source configurePhase
-
-location jetty-9.4.3 "http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.3.v20170317/" {
-	org.eclipse.jetty.client [9.4.3.v20170317,9.4.3.v20170317]
-	org.eclipse.jetty.client.source [9.4.3.v20170317,9.4.3.v20170317]
-	org.eclipse.jetty.continuation [9.4.3.v20170317,9.4.3.v20170317]
-	org.eclipse.jetty.continuation.source [9.4.3.v20170317,9.4.3.v20170317]
-	org.eclipse.jetty.http [9.4.3.v20170317,9.4.3.v20170317]
-	org.eclipse.jetty.http.source [9.4.3.v20170317,9.4.3.v20170317]
-	org.eclipse.jetty.io [9.4.3.v20170317,9.4.3.v20170317]
-	org.eclipse.jetty.io.source [9.4.3.v20170317,9.4.3.v20170317]
-	org.eclipse.jetty.security [9.4.3.v20170317,9.4.3.v20170317]
-	org.eclipse.jetty.security.source [9.4.3.v20170317,9.4.3.v20170317]
-	org.eclipse.jetty.server [9.4.3.v20170317,9.4.3.v20170317]
-	org.eclipse.jetty.server.source [9.4.3.v20170317,9.4.3.v20170317]
-	org.eclipse.jetty.servlet [9.4.3.v20170317,9.4.3.v20170317]
-	org.eclipse.jetty.servlet.source [9.4.3.v20170317,9.4.3.v20170317]
-	org.eclipse.jetty.util [9.4.3.v20170317,9.4.3.v20170317]
-	org.eclipse.jetty.util.source [9.4.3.v20170317,9.4.3.v20170317]
-}
diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index f0a36834c..f7761e7ce 100644
--- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
@@ -13,20 +13,20 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
  org.apache.commons.compress.archivers.tar;version="[1.3,2.0)",
  org.apache.commons.compress.archivers.zip;version="[1.3,2.0)",
  org.apache.commons.logging;version="1.1.1",
- org.eclipse.jetty.continuation;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.http;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.io;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.security;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.security.authentication;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.server;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.server.handler;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.server.nio;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.servlet;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util.component;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util.log;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util.security;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util.thread;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.continuation;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.http;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.io;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.security;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.security.authentication;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.server;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.server.handler;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.server.nio;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.servlet;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.util;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.util.component;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.util.log;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.util.security;version="[9.3.0,10.0.0)",
+ org.eclipse.jetty.util.thread;version="[9.3.0,10.0.0)",
  org.eclipse.jgit.api;version="[4.7.0,4.8.0)",
  org.eclipse.jgit.api.errors;version="[4.7.0,4.8.0)",
  org.eclipse.jgit.archive;version="[4.7.0,4.8.0)",