diff options
15 files changed, 103 insertions, 117 deletions
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 bce44f9bf3..da3a09809b 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 class DumbClientSmartServerTest extends HttpTestCase { .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 class DumbClientSmartServerTest extends HttpTestCase { 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 3e882719b3..2b9105cfe7 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 class SmartClientSmartServerTest extends HttpTestCase { } 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 class SmartClientSmartServerTest extends HttpTestCase { 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 df6668c12a..e8b4d06e69 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 1c32f7d165..ced9c2c14f 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 09754317ed..44c1977171 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,30 +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); @@ -230,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 c7545a94b4..7600843d23 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 { @@ -155,8 +154,7 @@ public class RecordingLogger implements Logger { 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 040b638ed7..f30bc2fa7e 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="1485388880"> +<target name="jgit-4.5" sequenceNumber="1484987843"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <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/"/> + <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/"/> </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 61b720308b..ba7a694b43 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 9582bf3fe6..163ab2c263 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="1485388877"> +<target name="jgit-4.6" sequenceNumber="1484987839"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <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/"/> + <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/"/> </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 4ffadff5f9..d07687815f 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 55a816245d..fa173e7b28 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="1485388865"> +<target name="jgit-4.7" sequenceNumber="1484987834"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <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/"/> + <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/"/> </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 426f935b56..4cd9e2b740 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 0000000000..289a73d2ae --- /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 33ff29dd47..0000000000 --- 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] -} @@ -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.1.v20170120</jetty-version> + <jetty-version>9.2.13.v20150730</jetty-version> <japicmp-version>0.5.3</japicmp-version> <httpclient-version>4.3.6</httpclient-version> <slf4j-version>1.7.2</slf4j-version> @@ -634,18 +634,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> |