Merge branch 'stable-4.6'
* stable-4.6: Update Jetty to 9.3.17.v20170317 Revert "Update Jetty to 9.4.1.v20170120 in buck build" Revert "Update Jetty to 9.4.1.v20170120" Change-Id: I9193b568cce9c72da899a8f3eaaf833956438e13 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
commit
6d5d3e4584
|
@ -8,20 +8,20 @@ Bundle-Localization: plugin
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||||
Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
|
Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
|
||||||
javax.servlet.http;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.continuation;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.http;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.http;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.io;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.io;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.security;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.security;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.security.authentication;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.security.authentication;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.server;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.server;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.server.handler;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.server.handler;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.server.nio;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.server.nio;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.servlet;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.servlet;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.util;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.util;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.util.component;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.util.component;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.util.log;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.util.log;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.util.security;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.util.security;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.util.thread;version="[9.3.0,10.0.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.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;version="[4.7.0,4.8.0)",
|
||||||
org.eclipse.jgit.http.server.glue;version="[4.7.0,4.8.0)",
|
org.eclipse.jgit.http.server.glue;version="[4.7.0,4.8.0)",
|
||||||
|
|
|
@ -10,16 +10,16 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||||
Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
|
Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
|
||||||
javax.servlet.http;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.apache.commons.logging;version="[1.1.1,2.0.0)",
|
||||||
org.eclipse.jetty.http;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.http;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.security;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.security;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.security.authentication;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.security.authentication;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.server;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.server;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.server.handler;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.server.handler;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.server.nio;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.server.nio;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.servlet;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.servlet;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.util.component;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.util.component;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.util.log;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.util.log;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.util.security;version="[9.3.0,10.0.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.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;version="[4.7.0,4.8.0)",
|
||||||
org.eclipse.jgit.internal.storage.file;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.revwalk;version="[4.7.0,4.8.0)",
|
||||||
org.eclipse.jgit.transport;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.eclipse.jgit.transport.resolver;version="[4.7.0,4.8.0)",
|
||||||
org.junit;version="[4.0.0,5.0.0)",
|
org.junit;version="[4.0.0,5.0.0)"
|
||||||
org.slf4j.helpers;version="[1.7.2,2.0.0)"
|
|
||||||
Export-Package: org.eclipse.jgit.junit.http;version="4.7.0";
|
Export-Package: org.eclipse.jgit.junit.http;version="4.7.0";
|
||||||
uses:="org.eclipse.jgit.transport,
|
uses:="org.eclipse.jgit.transport,
|
||||||
org.eclipse.jgit.junit,
|
org.eclipse.jgit.junit,
|
||||||
|
|
|
@ -93,11 +93,6 @@
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
<groupId>org.eclipse.jetty</groupId>
|
||||||
<artifactId>jetty-servlet</artifactId>
|
<artifactId>jetty-servlet</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-security</artifactId>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
|
@ -46,6 +46,7 @@
|
||||||
import static org.junit.Assert.assertFalse;
|
import static org.junit.Assert.assertFalse;
|
||||||
import static org.junit.Assert.assertTrue;
|
import static org.junit.Assert.assertTrue;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
import java.net.InetAddress;
|
import java.net.InetAddress;
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
import java.net.URISyntaxException;
|
import java.net.URISyntaxException;
|
||||||
|
@ -53,21 +54,21 @@
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.eclipse.jetty.security.AbstractLoginService;
|
|
||||||
import org.eclipse.jetty.security.Authenticator;
|
import org.eclipse.jetty.security.Authenticator;
|
||||||
import org.eclipse.jetty.security.ConstraintMapping;
|
import org.eclipse.jetty.security.ConstraintMapping;
|
||||||
import org.eclipse.jetty.security.ConstraintSecurityHandler;
|
import org.eclipse.jetty.security.ConstraintSecurityHandler;
|
||||||
|
import org.eclipse.jetty.security.MappedLoginService;
|
||||||
import org.eclipse.jetty.security.authentication.BasicAuthenticator;
|
import org.eclipse.jetty.security.authentication.BasicAuthenticator;
|
||||||
import org.eclipse.jetty.server.Connector;
|
import org.eclipse.jetty.server.Connector;
|
||||||
import org.eclipse.jetty.server.HttpConfiguration;
|
import org.eclipse.jetty.server.HttpConfiguration;
|
||||||
import org.eclipse.jetty.server.HttpConnectionFactory;
|
import org.eclipse.jetty.server.HttpConnectionFactory;
|
||||||
import org.eclipse.jetty.server.Server;
|
import org.eclipse.jetty.server.Server;
|
||||||
import org.eclipse.jetty.server.ServerConnector;
|
import org.eclipse.jetty.server.ServerConnector;
|
||||||
|
import org.eclipse.jetty.server.UserIdentity;
|
||||||
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
|
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
|
||||||
import org.eclipse.jetty.servlet.ServletContextHandler;
|
import org.eclipse.jetty.servlet.ServletContextHandler;
|
||||||
import org.eclipse.jetty.util.security.Constraint;
|
import org.eclipse.jetty.util.security.Constraint;
|
||||||
import org.eclipse.jetty.util.security.Credential;
|
import org.eclipse.jetty.util.security.Password;
|
||||||
import org.eclipse.jetty.util.security.Credential.Crypt;
|
|
||||||
import org.eclipse.jgit.transport.URIish;
|
import org.eclipse.jgit.transport.URIish;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -167,29 +168,36 @@ public ServletContextHandler authBasic(ServletContextHandler ctx) {
|
||||||
return ctx;
|
return ctx;
|
||||||
}
|
}
|
||||||
|
|
||||||
static class TestLoginService extends AbstractLoginService {
|
static class TestMappedLoginService extends MappedLoginService {
|
||||||
|
|
||||||
private String role;
|
private String role;
|
||||||
|
|
||||||
TestLoginService(String role) {
|
TestMappedLoginService(String role) {
|
||||||
this.role = role;
|
this.role = role;
|
||||||
}
|
}
|
||||||
@Override
|
|
||||||
protected String[] loadRoleInfo(UserPrincipal user) {
|
|
||||||
return new String[] { role };
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected UserPrincipal loadUserInfo(String name) {
|
protected UserIdentity loadUser(String who) {
|
||||||
return new UserPrincipal(username,
|
return null;
|
||||||
Credential.getCredential(Crypt.crypt(username, password)));
|
}
|
||||||
|
|
||||||
|
@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) {
|
private void auth(ServletContextHandler ctx, Authenticator authType) {
|
||||||
final String role = "can-access";
|
final String role = "can-access";
|
||||||
|
|
||||||
TestLoginService users = new TestLoginService(role);
|
MappedLoginService users = new TestMappedLoginService(role);
|
||||||
ConstraintMapping cm = new ConstraintMapping();
|
ConstraintMapping cm = new ConstraintMapping();
|
||||||
cm.setConstraint(new Constraint());
|
cm.setConstraint(new Constraint());
|
||||||
cm.getConstraint().setAuthenticate(true);
|
cm.getConstraint().setAuthenticate(true);
|
||||||
|
@ -229,7 +237,6 @@ public void setUp() throws Exception {
|
||||||
public void tearDown() throws Exception {
|
public void tearDown() throws Exception {
|
||||||
RecordingLogger.clear();
|
RecordingLogger.clear();
|
||||||
log.clear();
|
log.clear();
|
||||||
server.setStopTimeout(0);
|
|
||||||
server.stop();
|
server.stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -49,7 +49,6 @@
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.eclipse.jetty.util.log.Logger;
|
import org.eclipse.jetty.util.log.Logger;
|
||||||
import org.slf4j.helpers.MessageFormatter;
|
|
||||||
|
|
||||||
/** Logs warnings into an array for later inspection. */
|
/** Logs warnings into an array for later inspection. */
|
||||||
public class RecordingLogger implements Logger {
|
public class RecordingLogger implements Logger {
|
||||||
|
@ -162,8 +161,7 @@ public void setDebugEnabled(boolean enabled) {
|
||||||
@Override
|
@Override
|
||||||
public void warn(String msg, Object... args) {
|
public void warn(String msg, Object... args) {
|
||||||
synchronized (warnings) {
|
synchronized (warnings) {
|
||||||
warnings.add(new Warning(
|
warnings.add(new Warning(MessageFormat.format(msg, args)));
|
||||||
MessageFormatter.format(msg, args).getMessage()));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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.client.methods;version="[4.3.0,5.0.0)",
|
||||||
org.apache.http.entity;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.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.continuation;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.http;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.http;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.io;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.io;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.security;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.security;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.security.authentication;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.security.authentication;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.server;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.server;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.server.handler;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.server.handler;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.server.nio;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.server.nio;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.servlet;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.servlet;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.util;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.util;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.util.component;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.util.component;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.util.log;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.util.log;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.util.security;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.util.security;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.util.thread;version="[9.3.0,10.0.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.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.lib;version="[4.7.0,4.8.0)",
|
||||||
org.eclipse.jgit.lfs.server.fs;version="[4.7.0,4.8.0)",
|
org.eclipse.jgit.lfs.server.fs;version="[4.7.0,4.8.0)",
|
||||||
|
|
|
@ -1,26 +1,26 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
<?pde?>
|
<?pde?>
|
||||||
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
|
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
|
||||||
<target name="jgit-4.5" sequenceNumber="1490913405">
|
<target name="jgit-4.5" sequenceNumber="1491140572">
|
||||||
<locations>
|
<locations>
|
||||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||||
<unit id="org.eclipse.jetty.client" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.client" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.client.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.client.source" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.continuation" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.continuation" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.continuation.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.continuation.source" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.http" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.http" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.http.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.http.source" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.io" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.io" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.io.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.io.source" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.security" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.security" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.security.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.security.source" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.server" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.server" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.server.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.server.source" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.servlet" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.servlet" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.servlet.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.servlet.source" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.util" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.util" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.util.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.util.source" version="9.3.17.v20170317"/>
|
||||||
<repository id="jetty-9.4.3" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.3.9.v20160517/"/>
|
<repository id="jetty-9.3.17" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.3.17.v20170317/"/>
|
||||||
</location>
|
</location>
|
||||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||||
<unit id="org.apache.ant" version="1.9.4.v201504302020"/>
|
<unit id="org.apache.ant" version="1.9.4.v201504302020"/>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
target "jgit-4.5" with source configurePhase
|
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/R20160221192158-Mars.tpd"
|
||||||
include "orbit/S20170306214312-Oxygen.tpd"
|
include "orbit/S20170306214312-Oxygen.tpd"
|
||||||
|
|
||||||
|
|
|
@ -1,26 +1,26 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
<?pde?>
|
<?pde?>
|
||||||
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
|
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
|
||||||
<target name="jgit-4.6" sequenceNumber="1490913387">
|
<target name="jgit-4.6" sequenceNumber="1491140561">
|
||||||
<locations>
|
<locations>
|
||||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||||
<unit id="org.eclipse.jetty.client" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.client" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.client.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.client.source" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.continuation" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.continuation" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.continuation.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.continuation.source" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.http" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.http" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.http.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.http.source" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.io" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.io" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.io.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.io.source" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.security" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.security" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.security.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.security.source" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.server" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.server" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.server.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.server.source" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.servlet" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.servlet" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.servlet.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.servlet.source" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.util" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.util" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.util.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.util.source" version="9.3.17.v20170317"/>
|
||||||
<repository id="jetty-9.4.3" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.3.9.v20160517/"/>
|
<repository id="jetty-9.3.17" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.3.17.v20170317/"/>
|
||||||
</location>
|
</location>
|
||||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||||
<unit id="org.apache.ant" version="1.9.6.v201510161327"/>
|
<unit id="org.apache.ant" version="1.9.6.v201510161327"/>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
target "jgit-4.6" with source configurePhase
|
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"
|
include "orbit/S20170306214312-Oxygen.tpd"
|
||||||
|
|
||||||
location "http://download.eclipse.org/releases/neon/" {
|
location "http://download.eclipse.org/releases/neon/" {
|
||||||
|
|
|
@ -1,26 +1,26 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
<?pde?>
|
<?pde?>
|
||||||
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
|
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
|
||||||
<target name="jgit-4.7" sequenceNumber="1490913364">
|
<target name="jgit-4.7" sequenceNumber="1491140544">
|
||||||
<locations>
|
<locations>
|
||||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||||
<unit id="org.eclipse.jetty.client" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.client" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.client.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.client.source" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.continuation" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.continuation" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.continuation.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.continuation.source" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.http" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.http" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.http.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.http.source" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.io" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.io" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.io.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.io.source" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.security" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.security" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.security.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.security.source" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.server" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.server" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.server.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.server.source" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.servlet" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.servlet" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.servlet.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.servlet.source" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.util" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.util" version="9.3.17.v20170317"/>
|
||||||
<unit id="org.eclipse.jetty.util.source" version="9.3.9.v20160517"/>
|
<unit id="org.eclipse.jetty.util.source" version="9.3.17.v20170317"/>
|
||||||
<repository id="jetty-9.4.3" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.3.9.v20160517/"/>
|
<repository id="jetty-9.3.17" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.3.17.v20170317/"/>
|
||||||
</location>
|
</location>
|
||||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||||
<unit id="org.apache.ant" version="1.9.6.v201510161327"/>
|
<unit id="org.apache.ant" version="1.9.6.v201510161327"/>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
target "jgit-4.7" with source configurePhase
|
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"
|
include "orbit/S20170306214312-Oxygen.tpd"
|
||||||
|
|
||||||
location "http://download.eclipse.org/releases/oxygen/" {
|
location "http://download.eclipse.org/releases/oxygen/" {
|
||||||
|
|
|
@ -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]
|
||||||
|
}
|
|
@ -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.tar;version="[1.3,2.0)",
|
||||||
org.apache.commons.compress.archivers.zip;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.apache.commons.logging;version="1.1.1",
|
||||||
org.eclipse.jetty.continuation;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.continuation;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.http;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.http;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.io;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.io;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.security;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.security;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.security.authentication;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.security.authentication;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.server;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.server;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.server.handler;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.server.handler;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.server.nio;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.server.nio;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.servlet;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.servlet;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.util;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.util;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.util.component;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.util.component;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.util.log;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.util.log;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.util.security;version="[9.3.0,10.0.0)",
|
org.eclipse.jetty.util.security;version="[9.0.0,9.4.0)",
|
||||||
org.eclipse.jetty.util.thread;version="[9.3.0,10.0.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;version="[4.7.0,4.8.0)",
|
||||||
org.eclipse.jgit.api.errors;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)",
|
org.eclipse.jgit.archive;version="[4.7.0,4.8.0)",
|
||||||
|
|
14
pom.xml
14
pom.xml
|
@ -200,7 +200,7 @@
|
||||||
<commons-compress-version>1.6</commons-compress-version>
|
<commons-compress-version>1.6</commons-compress-version>
|
||||||
<osgi-core-version>4.3.1</osgi-core-version>
|
<osgi-core-version>4.3.1</osgi-core-version>
|
||||||
<servlet-api-version>3.1.0</servlet-api-version>
|
<servlet-api-version>3.1.0</servlet-api-version>
|
||||||
<jetty-version>9.4.3.v20170317</jetty-version>
|
<jetty-version>9.3.17.v20170317</jetty-version>
|
||||||
<japicmp-version>0.5.3</japicmp-version>
|
<japicmp-version>0.5.3</japicmp-version>
|
||||||
<httpclient-version>4.3.6</httpclient-version>
|
<httpclient-version>4.3.6</httpclient-version>
|
||||||
<slf4j-version>1.7.2</slf4j-version>
|
<slf4j-version>1.7.2</slf4j-version>
|
||||||
|
@ -634,18 +634,6 @@
|
||||||
<version>${jetty-version}</version>
|
<version>${jetty-version}</version>
|
||||||
</dependency>
|
</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>
|
<dependency>
|
||||||
<groupId>org.osgi</groupId>
|
<groupId>org.osgi</groupId>
|
||||||
<artifactId>org.osgi.core</artifactId>
|
<artifactId>org.osgi.core</artifactId>
|
||||||
|
|
Loading…
Reference in New Issue