Merge branch 'stable-4.6'

* stable-4.6:
  Update Jetty to 9.3.17.v20170317
  Revert "Update Jetty to 9.4.1.v20170120 in buck build"
  Revert "Update Jetty to 9.4.1.v20170120"

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

15 files changed, 152 insertions, 145 deletions

diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index 8435fb67d6..1e5d008019 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.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.jetty.continuation;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.http;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.io;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.security;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.security.authentication;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.server;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.server.handler;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.server.nio;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.servlet;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.util;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.util.component;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.util.log;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.util.security;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.util.thread;version="[9.0.0,9.4.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 836ab8a2c8..188f62a1ee 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.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.jetty.http;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.security;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.security.authentication;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.server;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.server.handler;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.server.nio;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.servlet;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.util.component;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.util.log;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.util.security;version="[9.0.0,9.4.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)",
@@ -28,8 +28,7 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
  org.eclipse.jgit.revwalk;version="[4.7.0,4.8.0)",
  org.eclipse.jgit.transport;version="[4.7.0,4.8.0)",
  org.eclipse.jgit.transport.resolver;version="[4.7.0,4.8.0)",
- org.junit;version="[4.0.0,5.0.0)",
- org.slf4j.helpers;version="[1.7.2,2.0.0)"
+ org.junit;version="[4.0.0,5.0.0)"
 Export-Package: org.eclipse.jgit.junit.http;version="4.7.0";
   uses:="org.eclipse.jgit.transport,
    org.eclipse.jgit.junit,
diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml
index abfe04380f..6a9464498b 100644
--- a/org.eclipse.jgit.junit.http/pom.xml
+++ b/org.eclipse.jgit.junit.http/pom.xml
@@ -93,11 +93,6 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-security</artifactId>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java
index e9480fa9ff..a66348452c 100644
--- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java
+++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java
@@ -46,6 +46,7 @@ package org.eclipse.jgit.junit.http;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import java.io.IOException;
 import java.net.InetAddress;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -53,21 +54,21 @@ import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.jetty.security.AbstractLoginService;
 import org.eclipse.jetty.security.Authenticator;
 import org.eclipse.jetty.security.ConstraintMapping;
 import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.security.MappedLoginService;
 import org.eclipse.jetty.security.authentication.BasicAuthenticator;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.UserIdentity;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.util.security.Constraint;
-import org.eclipse.jetty.util.security.Credential;
-import org.eclipse.jetty.util.security.Credential.Crypt;
+import org.eclipse.jetty.util.security.Password;
 import org.eclipse.jgit.transport.URIish;
 
 /**
@@ -167,29 +168,36 @@ public class AppServer {
 		return ctx;
 	}
 
-	static class TestLoginService extends AbstractLoginService {
-
+	static class TestMappedLoginService extends MappedLoginService {
 		private String role;
 
-		TestLoginService(String role) {
+		TestMappedLoginService(String role) {
 			this.role = role;
 		}
+
 		@Override
-		protected String[] loadRoleInfo(UserPrincipal user) {
-			return new String[] { role };
+		protected UserIdentity loadUser(String who) {
+			return null;
 		}
 
 		@Override
-		protected UserPrincipal loadUserInfo(String name) {
-			return new UserPrincipal(username,
-					Credential.getCredential(Crypt.crypt(username, password)));
+		protected void loadUsers() throws IOException {
+			putUser(username, new Password(password), new String[] { role });
+		}
+
+		protected String[] loadRoleInfo(KnownUser user) {
+			return null;
+		}
+
+		protected KnownUser loadUserInfo(String usrname) {
+			return null;
 		}
 	}
 
 	private void auth(ServletContextHandler ctx, Authenticator authType) {
 		final String role = "can-access";
 
-		TestLoginService users = new TestLoginService(role);
+		MappedLoginService users = new TestMappedLoginService(role);
 		ConstraintMapping cm = new ConstraintMapping();
 		cm.setConstraint(new Constraint());
 		cm.getConstraint().setAuthenticate(true);
@@ -229,7 +237,6 @@ public class AppServer {
 	public void tearDown() throws Exception {
 		RecordingLogger.clear();
 		log.clear();
-		server.setStopTimeout(0);
 		server.stop();
 	}
 
diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/RecordingLogger.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/RecordingLogger.java
index f28ef893bb..415398da26 100644
--- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/RecordingLogger.java
+++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/RecordingLogger.java
@@ -49,7 +49,6 @@ import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.jetty.util.log.Logger;
-import org.slf4j.helpers.MessageFormatter;
 
 /** Logs warnings into an array for later inspection. */
 public class RecordingLogger implements Logger {
@@ -162,8 +161,7 @@ public class RecordingLogger implements Logger {
 	@Override
 	public void warn(String msg, Object... args) {
 		synchronized (warnings) {
-			warnings.add(new Warning(
-					MessageFormatter.format(msg, args).getMessage()));
+			warnings.add(new Warning(MessageFormat.format(msg, args)));
 		}
 	}
 
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 508f754aa6..578d3ea4d4 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.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.jetty.continuation;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.http;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.io;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.security;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.security.authentication;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.server;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.server.handler;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.server.nio;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.servlet;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.util;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.util.component;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.util.log;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.util.security;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.util.thread;version="[9.0.0,9.4.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 5227e1d86b..1d537e6d71 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="1490913405">
+<target name="jgit-4.5" sequenceNumber="1491140572">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <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/"/>
+      <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.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 d73f848f29..ea4f5f629c 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.3.9.tpd"
+include "projects/jetty-9.3.17.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 9760157c07..babcf0928b 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="1490913387">
+<target name="jgit-4.6" sequenceNumber="1491140561">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <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/"/>
+      <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.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 ed3e840fb5..b699452dfe 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.3.9.tpd"
+include "projects/jetty-9.3.17.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 0eba32fbbd..5e4f5558f2 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="1490913364">
+<target name="jgit-4.7" sequenceNumber="1491140544">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <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/"/>
+      <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.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 d99c74a4bf..624b1191a9 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.3.9.tpd"
+include "projects/jetty-9.3.17.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.17.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.3.17.tpd
new file mode 100644
index 0000000000..662df09f77
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.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]
+}
diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index f7761e7ce2..04d5fa5b5c 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.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.jetty.continuation;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.http;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.io;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.security;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.security.authentication;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.server;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.server.handler;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.server.nio;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.servlet;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.util;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.util.component;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.util.log;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.util.security;version="[9.0.0,9.4.0)",
+ org.eclipse.jetty.util.thread;version="[9.0.0,9.4.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)",
diff --git a/pom.xml b/pom.xml
index 408c248136..b4373d7c5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,7 +200,7 @@
     <commons-compress-version>1.6</commons-compress-version>
     <osgi-core-version>4.3.1</osgi-core-version>
     <servlet-api-version>3.1.0</servlet-api-version>
-    <jetty-version>9.4.3.v20170317</jetty-version>
+    <jetty-version>9.3.17.v20170317</jetty-version>
     <japicmp-version>0.5.3</japicmp-version>
     <httpclient-version>4.3.6</httpclient-version>
     <slf4j-version>1.7.2</slf4j-version>
@@ -635,18 +635,6 @@
       </dependency>
 
       <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-security</artifactId>
-        <version>${jetty-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-util</artifactId>
-        <version>${jetty-version}</version>
-      </dependency>
-
-      <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.core</artifactId>
         <version>${osgi-core-version}</version>