Merge "Update to Jetty 9.2.10"
This commit is contained in:
commit
1b18a6e1b6
|
@ -8,20 +8,20 @@ Bundle-Localization: plugin
|
|||
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
||||
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="[7.6.0,8.0.0)",
|
||||
org.eclipse.jetty.http;version="[7.6.0,8.0.0)",
|
||||
org.eclipse.jetty.io;version="[7.6.0,8.0.0)",
|
||||
org.eclipse.jetty.security;version="[7.6.0,8.0.0)",
|
||||
org.eclipse.jetty.security.authentication;version="[7.6.0,8.0.0)",
|
||||
org.eclipse.jetty.server;version="[7.6.0,8.0.0)",
|
||||
org.eclipse.jetty.server.handler;version="[7.6.0,8.0.0)",
|
||||
org.eclipse.jetty.server.nio;version="[7.6.0,8.0.0)",
|
||||
org.eclipse.jetty.servlet;version="[7.6.0,8.0.0)",
|
||||
org.eclipse.jetty.util;version="[7.6.0,8.0.0)",
|
||||
org.eclipse.jetty.util.component;version="[7.6.0,8.0.0)",
|
||||
org.eclipse.jetty.util.log;version="[7.6.0,8.0.0)",
|
||||
org.eclipse.jetty.util.security;version="[7.6.0,8.0.0)",
|
||||
org.eclipse.jetty.util.thread;version="[7.6.0,8.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.jgit.errors;version="[4.0.0,4.1.0)",
|
||||
org.eclipse.jgit.http.server;version="[4.0.0,4.1.0)",
|
||||
org.eclipse.jgit.http.server.glue;version="[4.0.0,4.1.0)",
|
||||
|
|
|
@ -133,7 +133,7 @@ private static final class R extends HttpServletRequestWrapper {
|
|||
private final String host;
|
||||
|
||||
R(final String user, final String host) {
|
||||
super(new Request() /* can't pass null, sigh */);
|
||||
super(new Request(null, null) /* can't pass null, sigh */);
|
||||
this.user = user;
|
||||
this.host = host;
|
||||
}
|
||||
|
|
|
@ -204,7 +204,7 @@ private static final class R extends HttpServletRequestWrapper {
|
|||
private final String host;
|
||||
|
||||
R(final String user, final String host) {
|
||||
super(new Request() /* can't pass null, sigh */);
|
||||
super(new Request(null, null) /* can't pass null, sigh */);
|
||||
this.user = user;
|
||||
this.host = host;
|
||||
}
|
||||
|
|
|
@ -160,7 +160,7 @@ private static final class R extends HttpServletRequestWrapper {
|
|||
private final String host;
|
||||
|
||||
R(final String user, final String host) {
|
||||
super(new Request() /* can't pass null, sigh */);
|
||||
super(new Request(null, null) /* can't pass null, sigh */);
|
||||
this.user = user;
|
||||
this.host = host;
|
||||
}
|
||||
|
|
|
@ -199,7 +199,8 @@ public void testListRemote() throws IOException {
|
|||
.startsWith("JGit/"));
|
||||
assertEquals("*/*", info.getRequestHeader(HDR_ACCEPT));
|
||||
assertEquals(200, info.getStatus());
|
||||
assertEquals("text/plain;charset=UTF-8", info
|
||||
assertEquals("text/plain; charset=UTF-8",
|
||||
info
|
||||
.getResponseHeader(HDR_CONTENT_TYPE));
|
||||
|
||||
AccessEvent head = requests.get(1);
|
||||
|
@ -268,7 +269,8 @@ 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", req.get(0).getResponseHeader(
|
||||
assertEquals("text/plain; charset=UTF-8",
|
||||
req.get(0).getResponseHeader(
|
||||
HDR_CONTENT_TYPE));
|
||||
}
|
||||
|
||||
|
|
|
@ -59,9 +59,11 @@
|
|||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.EnumSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.servlet.DispatcherType;
|
||||
import javax.servlet.Filter;
|
||||
import javax.servlet.FilterChain;
|
||||
import javax.servlet.FilterConfig;
|
||||
|
@ -72,7 +74,6 @@
|
|||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.eclipse.jetty.servlet.FilterHolder;
|
||||
import org.eclipse.jetty.servlet.FilterMapping;
|
||||
import org.eclipse.jetty.servlet.ServletContextHandler;
|
||||
import org.eclipse.jetty.servlet.ServletHolder;
|
||||
import org.eclipse.jgit.errors.RemoteRepositoryException;
|
||||
|
@ -185,7 +186,8 @@ public void init(FilterConfig filterConfig) throws ServletException {
|
|||
public void destroy() {
|
||||
//
|
||||
}
|
||||
}), "/" + srcName + "/git-upload-pack", FilterMapping.DEFAULT);
|
||||
}), "/" + srcName + "/git-upload-pack",
|
||||
EnumSet.of(DispatcherType.REQUEST));
|
||||
broken.addServlet(new ServletHolder(gs), "/*");
|
||||
|
||||
server.setUp();
|
||||
|
@ -504,8 +506,8 @@ 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", service
|
||||
.getResponseHeader(HDR_CONTENT_TYPE));
|
||||
assertEquals("text/plain; charset=UTF-8",
|
||||
service.getResponseHeader(HDR_CONTENT_TYPE));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
|
@ -10,16 +10,16 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
|||
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="[7.6.0,8.0.0)",
|
||||
org.eclipse.jetty.security;version="[7.6.0,8.0.0)",
|
||||
org.eclipse.jetty.security.authentication;version="[7.6.0,8.0.0)",
|
||||
org.eclipse.jetty.server;version="[7.6.0,8.0.0)",
|
||||
org.eclipse.jetty.server.handler;version="[7.6.0,8.0.0)",
|
||||
org.eclipse.jetty.server.nio;version="[7.6.0,8.0.0)",
|
||||
org.eclipse.jetty.servlet;version="[7.6.0,8.0.0)",
|
||||
org.eclipse.jetty.util.component;version="[7.6.0,8.0.0)",
|
||||
org.eclipse.jetty.util.log;version="[7.6.0,8.0.0)",
|
||||
org.eclipse.jetty.util.security;version="[7.6.0,8.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.jgit.errors;version="[4.0.0,4.1.0)",
|
||||
org.eclipse.jgit.http.server;version="[4.0.0,4.1.0)",
|
||||
org.eclipse.jgit.internal.storage.file;version="[4.0.0,4.1.0)",
|
||||
|
|
|
@ -60,10 +60,12 @@
|
|||
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.server.nio.SelectChannelConnector;
|
||||
import org.eclipse.jetty.servlet.ServletContextHandler;
|
||||
import org.eclipse.jetty.util.security.Constraint;
|
||||
import org.eclipse.jetty.util.security.Password;
|
||||
|
@ -95,14 +97,22 @@ public class AppServer {
|
|||
|
||||
private final Server server;
|
||||
|
||||
private final Connector connector;
|
||||
private final ServerConnector connector;
|
||||
|
||||
private final ContextHandlerCollection contexts;
|
||||
|
||||
private final TestRequestLog log;
|
||||
|
||||
public AppServer() {
|
||||
connector = new SelectChannelConnector();
|
||||
server = new Server();
|
||||
|
||||
HttpConfiguration http_config = new HttpConfiguration();
|
||||
http_config.setSecureScheme("https");
|
||||
http_config.setSecurePort(8443);
|
||||
http_config.setOutputBufferSize(32768);
|
||||
|
||||
connector = new ServerConnector(server,
|
||||
new HttpConnectionFactory(http_config));
|
||||
connector.setPort(0);
|
||||
try {
|
||||
final InetAddress me = InetAddress.getByName("localhost");
|
||||
|
@ -116,7 +126,6 @@ public AppServer() {
|
|||
log = new TestRequestLog();
|
||||
log.setHandler(contexts);
|
||||
|
||||
server = new Server();
|
||||
server.setConnectors(new Connector[] { connector });
|
||||
server.setHandler(log);
|
||||
}
|
||||
|
@ -173,7 +182,6 @@ protected void loadUsers() throws IOException {
|
|||
cm.setPathSpec("/*");
|
||||
|
||||
ConstraintSecurityHandler sec = new ConstraintSecurityHandler();
|
||||
sec.setStrict(false);
|
||||
sec.setRealmName(realm);
|
||||
sec.setAuthenticator(authType);
|
||||
sec.setLoginService(users);
|
||||
|
@ -232,7 +240,7 @@ public URI getURI() {
|
|||
/** @return the local port number the server is listening on. */
|
||||
public int getPort() {
|
||||
assertAlreadySetUp();
|
||||
return ((SelectChannelConnector) connector).getLocalPort();
|
||||
return connector.getLocalPort();
|
||||
}
|
||||
|
||||
/** @return all requests since the server was started. */
|
||||
|
|
|
@ -187,4 +187,9 @@ public void debug(Throwable thrown) {
|
|||
public void ignore(Throwable arg0) {
|
||||
// Ignore (not relevant to test failures)
|
||||
}
|
||||
|
||||
@Override
|
||||
public void debug(String msg, long value) {
|
||||
// Ignore (not relevant to test failures)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -48,11 +48,11 @@
|
|||
import java.util.List;
|
||||
import java.util.concurrent.Semaphore;
|
||||
|
||||
import javax.servlet.DispatcherType;
|
||||
import javax.servlet.ServletException;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.eclipse.jetty.server.DispatcherType;
|
||||
import org.eclipse.jetty.server.Request;
|
||||
import org.eclipse.jetty.server.Response;
|
||||
import org.eclipse.jetty.server.handler.HandlerWrapper;
|
||||
|
|
|
@ -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.3" sequenceNumber="1431125767">
|
||||
<target name="jgit-4.3" sequenceNumber="1431244100">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.http" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.io" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.security" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.server" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.util" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="7.6.14.v20131031"/>
|
||||
<repository id="jetty-7.6.14" location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.14.v20131031/"/>
|
||||
<unit id="org.eclipse.jetty.client" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.2.10.v20150310"/>
|
||||
<repository id="jetty-9.2.10" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.2.10.v20150310/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.apache.ant" version="1.9.2.v201404171502"/>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
target "jgit-4.3" with source configurePhase
|
||||
|
||||
include "projects/jetty-7.6.14.tpd"
|
||||
include "projects/jetty-9.2.10.tpd"
|
||||
include "orbit/R20150124073747-Luna-SR2.tpd"
|
||||
|
||||
location "http://download.eclipse.org/releases/kepler/" {
|
||||
|
|
|
@ -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.4" sequenceNumber="1431125746">
|
||||
<target name="jgit-4.4" sequenceNumber="1431244089">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.http" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.io" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.security" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.server" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.util" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="7.6.14.v20131031"/>
|
||||
<repository id="jetty-7.6.14" location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.14.v20131031/"/>
|
||||
<unit id="org.eclipse.jetty.client" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.2.10.v20150310"/>
|
||||
<repository id="jetty-9.2.10" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.2.10.v20150310/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.apache.ant" version="1.9.2.v201404171502"/>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
target "jgit-4.4" with source configurePhase
|
||||
|
||||
include "projects/jetty-7.6.14.tpd"
|
||||
include "projects/jetty-9.2.10.tpd"
|
||||
include "orbit/R20150124073747-Luna-SR2.tpd"
|
||||
|
||||
location "http://download.eclipse.org/releases/luna/" {
|
||||
|
|
|
@ -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="1431125729">
|
||||
<target name="jgit-4.5" sequenceNumber="1431244072">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.http" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.io" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.security" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.server" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.util" version="7.6.14.v20131031"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="7.6.14.v20131031"/>
|
||||
<repository id="jetty-7.6.14" location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.14.v20131031/"/>
|
||||
<unit id="org.eclipse.jetty.client" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.2.10.v20150310"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.2.10.v20150310"/>
|
||||
<repository id="jetty-9.2.10" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.2.10.v20150310/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.apache.ant" version="1.9.4.v201410062020"/>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
target "jgit-4.5" with source configurePhase
|
||||
|
||||
include "projects/jetty-7.6.14.tpd"
|
||||
include "projects/jetty-9.2.10.tpd"
|
||||
include "orbit/S20150202203538-Mars-M5.tpd"
|
||||
|
||||
location "http://download.eclipse.org/releases/mars/" {
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
target "jetty-7.6.14" with source configurePhase
|
||||
|
||||
location jetty-7.6.14 "http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.14.v20131031/" {
|
||||
org.eclipse.jetty.client [7.6.14.v20131031,7.6.14.v20131031]
|
||||
org.eclipse.jetty.client.source [7.6.14.v20131031,7.6.14.v20131031]
|
||||
org.eclipse.jetty.continuation [7.6.14.v20131031,7.6.14.v20131031]
|
||||
org.eclipse.jetty.continuation.source [7.6.14.v20131031,7.6.14.v20131031]
|
||||
org.eclipse.jetty.http [7.6.14.v20131031,7.6.14.v20131031]
|
||||
org.eclipse.jetty.http.source [7.6.14.v20131031,7.6.14.v20131031]
|
||||
org.eclipse.jetty.io [7.6.14.v20131031,7.6.14.v20131031]
|
||||
org.eclipse.jetty.io.source [7.6.14.v20131031,7.6.14.v20131031]
|
||||
org.eclipse.jetty.security [7.6.14.v20131031,7.6.14.v20131031]
|
||||
org.eclipse.jetty.security.source [7.6.14.v20131031,7.6.14.v20131031]
|
||||
org.eclipse.jetty.server [7.6.14.v20131031,7.6.14.v20131031]
|
||||
org.eclipse.jetty.server.source [7.6.14.v20131031,7.6.14.v20131031]
|
||||
org.eclipse.jetty.servlet [7.6.14.v20131031,7.6.14.v20131031]
|
||||
org.eclipse.jetty.servlet.source [7.6.14.v20131031,7.6.14.v20131031]
|
||||
org.eclipse.jetty.util [7.6.14.v20131031,7.6.14.v20131031]
|
||||
org.eclipse.jetty.util.source [7.6.14.v20131031,7.6.14.v20131031]
|
||||
}
|
|
@ -0,0 +1,20 @@
|
|||
target "jetty-9.2.10" with source configurePhase
|
||||
|
||||
location jetty-9.2.10 "http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.2.10.v20150310/" {
|
||||
org.eclipse.jetty.client [9.2.10.v20150310,9.2.10.v20150310]
|
||||
org.eclipse.jetty.client.source [9.2.10.v20150310,9.2.10.v20150310]
|
||||
org.eclipse.jetty.continuation [9.2.10.v20150310,9.2.10.v20150310]
|
||||
org.eclipse.jetty.continuation.source [9.2.10.v20150310,9.2.10.v20150310]
|
||||
org.eclipse.jetty.http [9.2.10.v20150310,9.2.10.v20150310]
|
||||
org.eclipse.jetty.http.source [9.2.10.v20150310,9.2.10.v20150310]
|
||||
org.eclipse.jetty.io [9.2.10.v20150310,9.2.10.v20150310]
|
||||
org.eclipse.jetty.io.source [9.2.10.v20150310,9.2.10.v20150310]
|
||||
org.eclipse.jetty.security [9.2.10.v20150310,9.2.10.v20150310]
|
||||
org.eclipse.jetty.security.source [9.2.10.v20150310,9.2.10.v20150310]
|
||||
org.eclipse.jetty.server [9.2.10.v20150310,9.2.10.v20150310]
|
||||
org.eclipse.jetty.server.source [9.2.10.v20150310,9.2.10.v20150310]
|
||||
org.eclipse.jetty.servlet [9.2.10.v20150310,9.2.10.v20150310]
|
||||
org.eclipse.jetty.servlet.source [9.2.10.v20150310,9.2.10.v20150310]
|
||||
org.eclipse.jetty.util [9.2.10.v20150310,9.2.10.v20150310]
|
||||
org.eclipse.jetty.util.source [9.2.10.v20150310,9.2.10.v20150310]
|
||||
}
|
2
pom.xml
2
pom.xml
|
@ -185,7 +185,7 @@
|
|||
<commons-compress-version>1.6</commons-compress-version>
|
||||
<osgi-core-version>4.3.1</osgi-core-version>
|
||||
<servlet-api-version>2.5</servlet-api-version>
|
||||
<jetty-version>7.6.14.v20131031</jetty-version>
|
||||
<jetty-version>9.2.10.v20150310</jetty-version>
|
||||
<clirr-version>2.6.1</clirr-version>
|
||||
<httpclient-version>4.1.3</httpclient-version>
|
||||
<slf4j-version>1.7.2</slf4j-version>
|
||||
|
|
Loading…
Reference in New Issue