Update Jetty to 9.4.1.v20170120

MappedLoginService is no longer available in Jetty 9.4 therefore base
TestLoginService on AbstractLoginService.

Apparently Jetty now uses slf4j hence adapt RecordingLogger accordingly
so we can log error messages containing slf4j style formatting anchors
"{}".

Change-Id: Ibb36aba8782882936849b6102001a88b699bb65c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
(cherry picked from commit 5e8e2179b218ede7d14b69dc5149b0691b5859cf)

8 files changed, 77 insertions, 77 deletions

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 f30bc2fa7e..040b638ed7 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="1484987843">
+<target name="jgit-4.5" sequenceNumber="1485388880">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.http" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.io" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.security" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.server" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.util" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.2.13.v20150730"/>
-      <repository id="jetty-9.2.13" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.2.13.v20150730/"/>
+      <unit id="org.eclipse.jetty.client" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.io" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.security" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.4.1.v20170120"/>
+      <repository id="jetty-9.4.1" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.1.v20170120/"/>
     </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 ba7a694b43..61b720308b 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.2.13.tpd"
+include "projects/jetty-9.4.1.tpd"
 include "orbit/R20160221192158-Mars.tpd"
 include "orbit/S20170120205402-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 163ab2c263..9582bf3fe6 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="1484987839">
+<target name="jgit-4.6" sequenceNumber="1485388877">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.http" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.io" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.security" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.server" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.util" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.2.13.v20150730"/>
-      <repository id="jetty-9.2.13" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.2.13.v20150730/"/>
+      <unit id="org.eclipse.jetty.client" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.io" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.security" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.4.1.v20170120"/>
+      <repository id="jetty-9.4.1" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.1.v20170120/"/>
     </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 d07687815f..4ffadff5f9 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.2.13.tpd"
+include "projects/jetty-9.4.1.tpd"
 include "orbit/S20170120205402-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 fa173e7b28..55a816245d 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="1484987834">
+<target name="jgit-4.7" sequenceNumber="1485388865">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.http" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.io" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.security" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.server" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.util" version="9.2.13.v20150730"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.2.13.v20150730"/>
-      <repository id="jetty-9.2.13" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.2.13.v20150730/"/>
+      <unit id="org.eclipse.jetty.client" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.io" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.security" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.1.v20170120"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.4.1.v20170120"/>
+      <repository id="jetty-9.4.1" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.1.v20170120/"/>
     </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 4cd9e2b740..426f935b56 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.2.13.tpd"
+include "projects/jetty-9.4.1.tpd"
 include "orbit/S20170120205402-Oxygen.tpd"
 
 location "http://download.eclipse.org/releases/oxygen/" {
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.2.13.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.2.13.tpd
deleted file mode 100644
index 289a73d2ae..0000000000
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.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.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.1.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.1.tpd
new file mode 100644
index 0000000000..33ff29dd47
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.1.tpd
@@ -0,0 +1,20 @@
+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]
+}