diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 8435fb67d..1e5d00801 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 836ab8a2c..188f62a1e 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 abfe04380..6a9464498 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 e9480fa9f..a66348452 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,29 +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 }; - } @Override - protected UserPrincipal loadUserInfo(String name) { - return new UserPrincipal(username, - Credential.getCredential(Crypt.crypt(username, password))); + protected UserIdentity loadUser(String who) { + return null; + } + + @Override + 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 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 f28ef893b..415398da2 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 { @@ -162,8 +161,7 @@ public void setDebugEnabled(boolean enabled) { @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 508f754aa..578d3ea4d 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 5227e1d86..1d537e6d7 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 d73f848f2..ea4f5f629 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 9760157c0..babcf0928 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 ed3e840fb..b699452df 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 0eba32fbb..5e4f5558f 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 d99c74a4b..624b1191a 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 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 f7761e7ce..04d5fa5b5 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 408c24813..b4373d7c5 100644 --- a/pom.xml +++ b/pom.xml @@ -200,7 +200,7 @@ 1.6 4.3.1 3.1.0 - 9.4.3.v20170317 + 9.3.17.v20170317 0.5.3 4.3.6 1.7.2 @@ -634,18 +634,6 @@ ${jetty-version} - - org.eclipse.jetty - jetty-security - ${jetty-version} - - - - org.eclipse.jetty - jetty-util - ${jetty-version} - - org.osgi org.osgi.core