From da6fa14fd180ddeb6c678118ffaae0211bbe9a57 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 31 Mar 2017 14:49:30 +0900 Subject: [PATCH 1/3] Revert "Update Jetty to 9.4.1.v20170120" This reverts commit e05caf91f1df86a95d3e0454000d345bb90a415e. Change-Id: Ia4287f130034a790759b5035505a093b4616a05a --- .../http/test/DumbClientSmartServerTest.java | 4 +-- .../http/test/SmartClientSmartServerTest.java | 4 +-- .../META-INF/MANIFEST.MF | 3 +- org.eclipse.jgit.junit.http/pom.xml | 5 --- .../eclipse/jgit/junit/http/AppServer.java | 32 ++++++++++------- .../jgit/junit/http/RecordingLogger.java | 4 +-- .../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.2.13.tpd | 20 +++++++++++ .../projects/jetty-9.4.1.tpd | 20 ----------- pom.xml | 14 +------- 15 files changed, 103 insertions(+), 117 deletions(-) create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.2.13.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.1.tpd diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java index bce44f9bf..da3a09809 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java @@ -199,7 +199,7 @@ public void testListRemote() throws IOException { .startsWith("JGit/")); assertEquals("*/*", info.getRequestHeader(HDR_ACCEPT)); assertEquals(200, info.getStatus()); - assertEquals("text/plain;charset=utf-8", + assertEquals("text/plain; charset=UTF-8", info .getResponseHeader(HDR_CONTENT_TYPE)); @@ -269,7 +269,7 @@ public void testInitialClone_Packed() throws Exception { assertEquals("GET", req.get(0).getMethod()); assertEquals(0, req.get(0).getParameters().size()); assertEquals(200, req.get(0).getStatus()); - assertEquals("text/plain;charset=utf-8", + assertEquals("text/plain; charset=UTF-8", req.get(0).getResponseHeader( HDR_CONTENT_TYPE)); } diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java index 3e882719b..2b9105cfe 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java @@ -454,7 +454,7 @@ public void testInitialClone_BrokenServer() throws Exception { } catch (TransportException err) { String exp = brokenURI + ": expected" + " Content-Type application/x-git-upload-pack-result;" - + " received Content-Type text/plain;charset=utf-8"; + + " received Content-Type text/plain; charset=UTF-8"; assertEquals(exp, err.getMessage()); } } @@ -476,7 +476,7 @@ public void testInitialClone_BrokenServer() throws Exception { assertEquals(join(brokenURI, "git-upload-pack"), service.getPath()); assertEquals(0, service.getParameters().size()); assertEquals(200, service.getStatus()); - assertEquals("text/plain;charset=utf-8", + assertEquals("text/plain; charset=UTF-8", service.getResponseHeader(HDR_CONTENT_TYPE)); } diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index df6668c12..e8b4d06e6 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -28,8 +28,7 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", org.eclipse.jgit.revwalk;version="[4.6.2,4.7.0)", org.eclipse.jgit.transport;version="[4.6.2,4.7.0)", org.eclipse.jgit.transport.resolver;version="[4.6.2,4.7.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.6.2"; 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 1c32f7d16..ced9c2c14 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -93,11 +93,6 @@ org.eclipse.jetty jetty-servlet - - - org.eclipse.jetty - jetty-security - 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 09754317e..44c197717 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 @@ 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.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,30 +168,36 @@ public ServletContextHandler authBasic(ServletContextHandler ctx) { 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); @@ -230,7 +237,6 @@ public void setUp() throws Exception { 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 c7545a94b..7600843d2 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.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 { @@ -155,8 +154,7 @@ public void setDebugEnabled(boolean enabled) { 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.packaging/org.eclipse.jgit.target/jgit-4.5.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target index 040b638ed..f30bc2fa7 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 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + 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 61b720308..ba7a694b4 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.1.tpd" +include "projects/jetty-9.2.13.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 9582bf3fe..163ab2c26 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 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + 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 4ffadff5f..d07687815 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.1.tpd" +include "projects/jetty-9.2.13.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 55a816245..fa173e7b2 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 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + 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 426f935b5..4cd9e2b74 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.1.tpd" +include "projects/jetty-9.2.13.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 new file mode 100644 index 000000000..289a73d2a --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.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.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 deleted file mode 100644 index 33ff29dd4..000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.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] -} diff --git a/pom.xml b/pom.xml index 7d81a38d5..98816444b 100644 --- a/pom.xml +++ b/pom.xml @@ -200,7 +200,7 @@ 1.6 4.3.1 3.1.0 - 9.4.1.v20170120 + 9.2.13.v20150730 0.5.3 4.3.6 1.7.2 @@ -633,18 +633,6 @@ ${jetty-version} - - org.eclipse.jetty - jetty-security - ${jetty-version} - - - - org.eclipse.jetty - jetty-util - ${jetty-version} - - org.osgi org.osgi.core From ebc290a4a0066e631f37596761e648b2ef5df185 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 1 Apr 2017 13:03:48 +0200 Subject: [PATCH 2/3] Revert "Update Jetty to 9.4.1.v20170120 in buck build" This reverts commit d3b80b951c0bf995f7d210710e3d31e9d529efe2. Change-Id: I596ba596f3e857346020e01b0a018d90a0b27edd --- lib/jetty/BUCK | 26 +++++++++++++------------- org.eclipse.jgit.junit.http/BUCK | 1 - 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/lib/jetty/BUCK b/lib/jetty/BUCK index c75b278f7..6e7dec306 100644 --- a/lib/jetty/BUCK +++ b/lib/jetty/BUCK @@ -1,10 +1,10 @@ -VERSION = '9.4.1.v20170120' +VERSION = '9.2.13.v20150730' GROUP = 'org.eclipse.jetty' maven_jar( name = 'servlet', - bin_sha1 = '406a6edc22311629b41e98ab26901574d243d408', - src_sha1 = '57cf143c4110e0d43635406a1052013bbf29a4da', + bin_sha1 = '5ad6e38015a97ae9a60b6c2ad744ccfa9cf93a50', + src_sha1 = '78fbec19321150552d91f9e079c2f2ca33222b01', group = GROUP, artifact = 'jetty-servlet', version = VERSION, @@ -12,8 +12,8 @@ maven_jar( maven_jar( name = 'security', - bin_sha1 = '677aa94298f42d322e2f19045693a233613537b6', - src_sha1 = '933928163506a8d366652fb895e770fcf3f9e8fe', + bin_sha1 = 'cc7c7f27ec4cc279253be1675d9e47e58b995943', + src_sha1 = '75632ebdf8bd651faafb97106c92496db59e165d', group = GROUP, artifact = 'jetty-security', version = VERSION, @@ -21,8 +21,8 @@ maven_jar( maven_jar( name = 'server', - bin_sha1 = '4cf4bea26592de98b9126ac60bc91fb669176a63', - src_sha1 = '2035ab117da534f9a525adfaa9f3a5634d202707', + bin_sha1 = '5be7d1da0a7abffd142de3091d160717c120b6ab', + src_sha1 = '203e123f83efe2a5b8a9c74854c7897fe3563302', group = GROUP, artifact = 'jetty-server', version = VERSION, @@ -30,8 +30,8 @@ maven_jar( maven_jar( name = 'http', - bin_sha1 = 'c9c9d5b15b3bb41ae9ae588b7aede301b42186f6', - src_sha1 = 'f1cbf0e1329ed722bf8eba74e4c4b94619dfe8a8', + bin_sha1 = '23a745d9177ef67ef53cc46b9b70c5870082efc2', + src_sha1 = '5f87f7ff2057cd4b0995bc4fffe17b2aff64c130', group = GROUP, artifact = 'jetty-http', version = VERSION, @@ -39,8 +39,8 @@ maven_jar( maven_jar( name = 'io', - bin_sha1 = '6d2d7c82a4b5306ec7bf2d6eb4b67460fce77240', - src_sha1 = '404b560a0d289c904b72d02e2dbb3b9ad73db219', + bin_sha1 = '7a351e6a1b63dfd56b6632623f7ca2793ffb67ad', + src_sha1 = 'bbd61a84b748fc295456e1c5c3070aaf40a68f62', group = GROUP, artifact = 'jetty-io', version = VERSION, @@ -48,8 +48,8 @@ maven_jar( maven_jar( name = 'util', - bin_sha1 = '810c4e4275e399feaf6e8bc51aa72645bdc06205', - src_sha1 = 'b0dea459e5646e9ccf250a236718d720fba7717c', + bin_sha1 = 'c101476360a7cdd0670462de04053507d5e70c97', + src_sha1 = '15ceecce141971b4e0facb861b3d10120ad6ce03', group = GROUP, artifact = 'jetty-util', version = VERSION, diff --git a/org.eclipse.jgit.junit.http/BUCK b/org.eclipse.jgit.junit.http/BUCK index d7eaa4879..68976a68a 100644 --- a/org.eclipse.jgit.junit.http/BUCK +++ b/org.eclipse.jgit.junit.http/BUCK @@ -8,7 +8,6 @@ java_library( '//org.eclipse.jgit.junit:junit', '//lib:junit', '//lib:servlet-api', - '//lib:slf4j-api', '//lib/jetty:http', '//lib/jetty:server', '//lib/jetty:servlet', From 1b45b06116eee607152822d58103f5e4973d27b8 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 1 Apr 2017 12:38:22 +0200 Subject: [PATCH 3/3] Update Jetty to 9.3.17.v20170317 Update to the latest 9.3 version until we have a solution for bug 514336 we face with 9.4.x versions. Change-Id: I6d8d476abe8677ce865a08099bb77330effc700a Signed-off-by: Matthias Sohn --- lib/jetty/BUCK | 26 +++++++------- .../META-INF/MANIFEST.MF | 28 +++++++-------- .../http/test/DumbClientSmartServerTest.java | 4 +-- .../http/test/SmartClientSmartServerTest.java | 4 +-- .../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.2.13.tpd | 20 ----------- .../projects/jetty-9.3.17.tpd | 20 +++++++++++ org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 28 +++++++-------- pom.xml | 2 +- 16 files changed, 147 insertions(+), 147 deletions(-) delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.2.13.tpd create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.3.17.tpd diff --git a/lib/jetty/BUCK b/lib/jetty/BUCK index 6e7dec306..fbb37c1e6 100644 --- a/lib/jetty/BUCK +++ b/lib/jetty/BUCK @@ -1,10 +1,10 @@ -VERSION = '9.2.13.v20150730' +VERSION = '9.3.17.v20170317' GROUP = 'org.eclipse.jetty' maven_jar( name = 'servlet', - bin_sha1 = '5ad6e38015a97ae9a60b6c2ad744ccfa9cf93a50', - src_sha1 = '78fbec19321150552d91f9e079c2f2ca33222b01', + bin_sha1 = 'ed6986b0d0ca7b9b0f9015c9efb80442e3043a8e', + src_sha1 = 'ee6b4784a00a92e5c1b6111033b7ae41ac6052a3', group = GROUP, artifact = 'jetty-servlet', version = VERSION, @@ -12,8 +12,8 @@ maven_jar( maven_jar( name = 'security', - bin_sha1 = 'cc7c7f27ec4cc279253be1675d9e47e58b995943', - src_sha1 = '75632ebdf8bd651faafb97106c92496db59e165d', + bin_sha1 = 'ca52535569445682d42aaa97c7039442719a0507', + src_sha1 = '2ff9f4fb18b320fd5a0272a427bacc4d5fe7bc86', group = GROUP, artifact = 'jetty-security', version = VERSION, @@ -21,8 +21,8 @@ maven_jar( maven_jar( name = 'server', - bin_sha1 = '5be7d1da0a7abffd142de3091d160717c120b6ab', - src_sha1 = '203e123f83efe2a5b8a9c74854c7897fe3563302', + bin_sha1 = '194e9a02e6ba249ef4a3f4bd56b4993087992299', + src_sha1 = '0c9bd572f530c411592aefb71781ecca0b3719a9', group = GROUP, artifact = 'jetty-server', version = VERSION, @@ -30,8 +30,8 @@ maven_jar( maven_jar( name = 'http', - bin_sha1 = '23a745d9177ef67ef53cc46b9b70c5870082efc2', - src_sha1 = '5f87f7ff2057cd4b0995bc4fffe17b2aff64c130', + bin_sha1 = '6c02d728e15d4868486254039c867a1ac3e4a52e', + src_sha1 = '3c0a2a82792f268631b4fefd77be9f126ec974b1', group = GROUP, artifact = 'jetty-http', version = VERSION, @@ -39,8 +39,8 @@ maven_jar( maven_jar( name = 'io', - bin_sha1 = '7a351e6a1b63dfd56b6632623f7ca2793ffb67ad', - src_sha1 = 'bbd61a84b748fc295456e1c5c3070aaf40a68f62', + bin_sha1 = '756a8cd2a1cbfb84a94973b6332dd3eccd47c0cd', + src_sha1 = 'a9afa99cccb19b441364fa805d027f457cbbb136', group = GROUP, artifact = 'jetty-io', version = VERSION, @@ -48,8 +48,8 @@ maven_jar( maven_jar( name = 'util', - bin_sha1 = 'c101476360a7cdd0670462de04053507d5e70c97', - src_sha1 = '15ceecce141971b4e0facb861b3d10120ad6ce03', + bin_sha1 = 'b8512ab02819de01f0f5a5c6026163041f579beb', + src_sha1 = '96f8e3dcdc3660a5c91f19c46695daa70ac95625', group = GROUP, artifact = 'jetty-util', version = VERSION, diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 9c98521db..6effed6f9 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.0.0,10.0.0)", - org.eclipse.jetty.http;version="[9.0.0,10.0.0)", - org.eclipse.jetty.io;version="[9.0.0,10.0.0)", - org.eclipse.jetty.security;version="[9.0.0,10.0.0)", - org.eclipse.jetty.security.authentication;version="[9.0.0,10.0.0)", - org.eclipse.jetty.server;version="[9.0.0,10.0.0)", - org.eclipse.jetty.server.handler;version="[9.0.0,10.0.0)", - org.eclipse.jetty.server.nio;version="[9.0.0,10.0.0)", - org.eclipse.jetty.servlet;version="[9.0.0,10.0.0)", - org.eclipse.jetty.util;version="[9.0.0,10.0.0)", - org.eclipse.jetty.util.component;version="[9.0.0,10.0.0)", - org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)", - org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)", - org.eclipse.jetty.util.thread;version="[9.0.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.6.2,4.7.0)", org.eclipse.jgit.http.server;version="[4.6.2,4.7.0)", org.eclipse.jgit.http.server.glue;version="[4.6.2,4.7.0)", diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java index da3a09809..bce44f9bf 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java @@ -199,7 +199,7 @@ public void testListRemote() throws IOException { .startsWith("JGit/")); assertEquals("*/*", info.getRequestHeader(HDR_ACCEPT)); assertEquals(200, info.getStatus()); - assertEquals("text/plain; charset=UTF-8", + assertEquals("text/plain;charset=utf-8", info .getResponseHeader(HDR_CONTENT_TYPE)); @@ -269,7 +269,7 @@ public void testInitialClone_Packed() throws Exception { assertEquals("GET", req.get(0).getMethod()); assertEquals(0, req.get(0).getParameters().size()); assertEquals(200, req.get(0).getStatus()); - assertEquals("text/plain; charset=UTF-8", + assertEquals("text/plain;charset=utf-8", req.get(0).getResponseHeader( HDR_CONTENT_TYPE)); } diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java index 2b9105cfe..3e882719b 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java @@ -454,7 +454,7 @@ public void testInitialClone_BrokenServer() throws Exception { } catch (TransportException err) { String exp = brokenURI + ": expected" + " Content-Type application/x-git-upload-pack-result;" - + " received Content-Type text/plain; charset=UTF-8"; + + " received Content-Type text/plain;charset=utf-8"; assertEquals(exp, err.getMessage()); } } @@ -476,7 +476,7 @@ public void testInitialClone_BrokenServer() throws Exception { assertEquals(join(brokenURI, "git-upload-pack"), service.getPath()); assertEquals(0, service.getParameters().size()); assertEquals(200, service.getStatus()); - assertEquals("text/plain; charset=UTF-8", + assertEquals("text/plain;charset=utf-8", service.getResponseHeader(HDR_CONTENT_TYPE)); } diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index e8b4d06e6..cd42e2c11 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.0.0,10.0.0)", - org.eclipse.jetty.security;version="[9.0.0,10.0.0)", - org.eclipse.jetty.security.authentication;version="[9.0.0,10.0.0)", - org.eclipse.jetty.server;version="[9.0.0,10.0.0)", - org.eclipse.jetty.server.handler;version="[9.0.0,10.0.0)", - org.eclipse.jetty.server.nio;version="[9.0.0,10.0.0)", - org.eclipse.jetty.servlet;version="[9.0.0,10.0.0)", - org.eclipse.jetty.util.component;version="[9.0.0,10.0.0)", - org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)", - org.eclipse.jetty.util.security;version="[9.0.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.6.2,4.7.0)", org.eclipse.jgit.http.server;version="[4.6.2,4.7.0)", org.eclipse.jgit.internal.storage.file;version="[4.6.2,4.7.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 a18eaa192..405e07a72 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.0.0,10.0.0)", - org.eclipse.jetty.http;version="[9.0.0,10.0.0)", - org.eclipse.jetty.io;version="[9.0.0,10.0.0)", - org.eclipse.jetty.security;version="[9.0.0,10.0.0)", - org.eclipse.jetty.security.authentication;version="[9.0.0,10.0.0)", - org.eclipse.jetty.server;version="[9.0.0,10.0.0)", - org.eclipse.jetty.server.handler;version="[9.0.0,10.0.0)", - org.eclipse.jetty.server.nio;version="[9.0.0,10.0.0)", - org.eclipse.jetty.servlet;version="[9.0.0,10.0.0)", - org.eclipse.jetty.util;version="[9.0.0,10.0.0)", - org.eclipse.jetty.util.component;version="[9.0.0,10.0.0)", - org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)", - org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)", - org.eclipse.jetty.util.thread;version="[9.0.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.6.2,4.7.0)", org.eclipse.jgit.lfs.lib;version="[4.6.2,4.7.0)", org.eclipse.jgit.lfs.server.fs;version="[4.6.2,4.7.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 f30bc2fa7..85585e804 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 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + 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 ba7a694b4..77d3e89ee 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.3.17.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 163ab2c26..a51b4559d 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 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + 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 d07687815..913f66124 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.3.17.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 fa173e7b2..541ce04ce 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 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + 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 4cd9e2b74..0ce8a9a0b 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.3.17.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 289a73d2a..000000000 --- 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.3.17.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.3.17.tpd new file mode 100644 index 000000000..662df09f7 --- /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 24b526217..5c30da754 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.0.0,10.0.0)", - org.eclipse.jetty.http;version="[9.0.0,10.0.0)", - org.eclipse.jetty.io;version="[9.0.0,10.0.0)", - org.eclipse.jetty.security;version="[9.0.0,10.0.0)", - org.eclipse.jetty.security.authentication;version="[9.0.0,10.0.0)", - org.eclipse.jetty.server;version="[9.0.0,10.0.0)", - org.eclipse.jetty.server.handler;version="[9.0.0,10.0.0)", - org.eclipse.jetty.server.nio;version="[9.0.0,10.0.0)", - org.eclipse.jetty.servlet;version="[9.0.0,10.0.0)", - org.eclipse.jetty.util;version="[9.0.0,10.0.0)", - org.eclipse.jetty.util.component;version="[9.0.0,10.0.0)", - org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)", - org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)", - org.eclipse.jetty.util.thread;version="[9.0.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.6.2,4.7.0)", org.eclipse.jgit.api.errors;version="[4.6.2,4.7.0)", org.eclipse.jgit.archive;version="[4.6.2,4.7.0)", diff --git a/pom.xml b/pom.xml index 98816444b..b8154c117 100644 --- a/pom.xml +++ b/pom.xml @@ -200,7 +200,7 @@ 1.6 4.3.1 3.1.0 - 9.2.13.v20150730 + 9.3.17.v20170317 0.5.3 4.3.6 1.7.2