github
/
jgit
mirror of https://gitee.com/github-mirror-repo/jgit.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Update jetty to 9.4.5 

* Adapt to API removals in jetty 9.4+
* Manifests changed to restrict jetty to [9.4.5,10.0.0)

Bug: 514336
Bug: 516514
Change-Id: Ifcfd968084dfa6db0ae07cf541d33a6cdedc1ee2
Signed-off-by: Mat Booth <mat.booth@redhat.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
stable-4.8
Mat Booth 8 years ago committed by Matthias Sohn
parent
2244078e87
commit
33bbbc3c77
17 changed files with 168 additions and 179 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      WORKSPACE
  2. 28
      org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
  3. 20
      org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
  4. 35
      org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java
  5. 6
      org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/RecordingLogger.java
  6. 28
      org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
  7. 36
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
  8. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd
  9. 36
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
  10. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd
  11. 34
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
  12. 4
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd
  13. 20
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.3.17.tpd
  14. 20
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.3.9.tpd
  15. 20
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.5.tpd
  16. 28
      org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
  17. 2
      pom.xml

26
WORKSPACE
Unescape View File

@ -105,46 +105,46 @@ maven_jar(
sha1 = "a60a5e993c98c864010053cb901b7eab25306568",
)
JETTY_VER = "9.3.17.v20170317"
JETTY_VER = "9.4.5.v20170502"
maven_jar(
name = "jetty_servlet",
artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VER,
sha1 = "ed6986b0d0ca7b9b0f9015c9efb80442e3043a8e",
src_sha1 = "ee6b4784a00a92e5c1b6111033b7ae41ac6052a3",
sha1 = "394a535b76ca7399b25be3266f06f614e020517e",
src_sha1 = "4e85803c8d539aa0a8389e113095ef86032ac425",
)
maven_jar(
name = "jetty_security",
artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER,
sha1 = "ca52535569445682d42aaa97c7039442719a0507",
src_sha1 = "2ff9f4fb18b320fd5a0272a427bacc4d5fe7bc86",
sha1 = "4f4fc4cbe3504b6c91143ee37b38a1f3de2dcc72",
src_sha1 = "2124a757c87eacea7ad6507be6a415b5b51139b5",
)
maven_jar(
name = "jetty_server",
artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER,
sha1 = "194e9a02e6ba249ef4a3f4bd56b4993087992299",
src_sha1 = "0c9bd572f530c411592aefb71781ecca0b3719a9",
sha1 = "b4d30340213c3d2a5f908860ba170c5a697829be",
src_sha1 = "295d873f609a0e2863f33b5dbc8906ca348f1107",
)
maven_jar(
name = "jetty_http",
artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER,
sha1 = "6c02d728e15d4868486254039c867a1ac3e4a52e",
src_sha1 = "3c0a2a82792f268631b4fefd77be9f126ec974b1",
sha1 = "c51b8a6a67d64672889249dd958edd77bff8fc0c",
src_sha1 = "c1bee39aeb565a4f26852b1851192d98ab611dbc",
)
maven_jar(
name = "jetty_io",
artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER,
sha1 = "756a8cd2a1cbfb84a94973b6332dd3eccd47c0cd",
src_sha1 = "a9afa99cccb19b441364fa805d027f457cbbb136",
sha1 = "76086f955d4e943396b8f340fd5bae3ce4da19d9",
src_sha1 = "8d41e410b2f0dd284a6e199ed08f45ef7ab2acf1",
)
maven_jar(
name = "jetty_util",
artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER,
sha1 = "b8512ab02819de01f0f5a5c6026163041f579beb",
src_sha1 = "96f8e3dcdc3660a5c91f19c46695daa70ac95625",
sha1 = "5fd36dfcf39110b809bd9b20cec62706ab694711",
src_sha1 = "629fcda1e4eecfd795e24cc07715ab9797970980",
)

28
org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
Unescape View File

@ -8,20 +8,20 @@ Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
javax.servlet.http;version="[2.5.0,3.2.0)",
org.eclipse.jetty.continuation;version="[9.0.0,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.jetty.continuation;version="[9.4.5,10.0.0)",
org.eclipse.jetty.http;version="[9.4.5,10.0.0)",
org.eclipse.jetty.io;version="[9.4.5,10.0.0)",
org.eclipse.jetty.security;version="[9.4.5,10.0.0)",
org.eclipse.jetty.security.authentication;version="[9.4.5,10.0.0)",
org.eclipse.jetty.server;version="[9.4.5,10.0.0)",
org.eclipse.jetty.server.handler;version="[9.4.5,10.0.0)",
org.eclipse.jetty.server.nio;version="[9.4.5,10.0.0)",
org.eclipse.jetty.servlet;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.component;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)",
org.eclipse.jgit.errors;version="[4.8.0,4.9.0)",
org.eclipse.jgit.http.server;version="[4.8.0,4.9.0)",
org.eclipse.jgit.http.server.glue;version="[4.8.0,4.9.0)",

20
org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
Unescape View File

@ -10,16 +10,16 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
javax.servlet.http;version="[2.5.0,3.2.0)",
org.apache.commons.logging;version="[1.1.1,2.0.0)",
org.eclipse.jetty.http;version="[9.0.0,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.jetty.http;version="[9.4.5,10.0.0)",
org.eclipse.jetty.security;version="[9.4.5,10.0.0)",
org.eclipse.jetty.security.authentication;version="[9.4.5,10.0.0)",
org.eclipse.jetty.server;version="[9.4.5,10.0.0)",
org.eclipse.jetty.server.handler;version="[9.4.5,10.0.0)",
org.eclipse.jetty.server.nio;version="[9.4.5,10.0.0)",
org.eclipse.jetty.servlet;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.component;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)",
org.eclipse.jgit.errors;version="[4.8.0,4.9.0)",
org.eclipse.jgit.http.server;version="[4.8.0,4.9.0)",
org.eclipse.jgit.internal.storage.file;version="[4.8.0,4.9.0)",

35
org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java
Unescape View File

@ -46,25 +46,25 @@ 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;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
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;
@ -168,38 +168,41 @@ public class AppServer {
return ctx;
}
static class TestMappedLoginService extends MappedLoginService {
static class TestMappedLoginService extends AbstractLoginService {
private String role;
protected final ConcurrentMap<String, UserPrincipal> users = new ConcurrentHashMap<>();
TestMappedLoginService(String role) {
this.role = role;
}
@Override
protected UserIdentity loadUser(String who) {
return null;
}
@Override
protected void loadUsers() throws IOException {
putUser(username, new Password(password), new String[] { role });
protected void doStart() throws Exception {
UserPrincipal p = new UserPrincipal(username,
new Password(password));
users.put(username, p);
super.doStart();
}
@Override
protected String[] loadRoleInfo(KnownUser user) {
return null;
protected String[] loadRoleInfo(UserPrincipal user) {
if (users.get(user.getName()) == null)
return null;
else
return new String[] { role };
}
@Override
protected KnownUser loadUserInfo(String usrname) {
return null;
protected UserPrincipal loadUserInfo(String user) {
return users.get(user);
}
}
private void auth(ServletContextHandler ctx, Authenticator authType) {
final String role = "can-access";
MappedLoginService users = new TestMappedLoginService(role);
AbstractLoginService users = new TestMappedLoginService(role);
ConstraintMapping cm = new ConstraintMapping();
cm.setConstraint(new Constraint());
cm.getConstraint().setAuthenticate(true);

6
org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/RecordingLogger.java
Unescape View File

@ -161,6 +161,12 @@ public class RecordingLogger implements Logger {
@Override
public void warn(String msg, Object... args) {
synchronized (warnings) {
int i = 0;
int index = msg.indexOf("{}");
while (index >= 0) {
msg = msg.replaceFirst("\\{\\}", "{" + i++ + "}");
index = msg.indexOf("{}");
}
warnings.add(new Warning(MessageFormat.format(msg, args)));
}
}

28
org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
Unescape View File

@ -13,20 +13,20 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
org.apache.http.client.methods;version="[4.3.0,5.0.0)",
org.apache.http.entity;version="[4.3.0,5.0.0)",
org.apache.http.impl.client;version="[4.3.0,5.0.0)",
org.eclipse.jetty.continuation;version="[9.0.0,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.jetty.continuation;version="[9.4.5,10.0.0)",
org.eclipse.jetty.http;version="[9.4.5,10.0.0)",
org.eclipse.jetty.io;version="[9.4.5,10.0.0)",
org.eclipse.jetty.security;version="[9.4.5,10.0.0)",
org.eclipse.jetty.security.authentication;version="[9.4.5,10.0.0)",
org.eclipse.jetty.server;version="[9.4.5,10.0.0)",
org.eclipse.jetty.server.handler;version="[9.4.5,10.0.0)",
org.eclipse.jetty.server.nio;version="[9.4.5,10.0.0)",
org.eclipse.jetty.servlet;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.component;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)",
org.eclipse.jgit.junit.http;version="[4.8.0,4.9.0)",
org.eclipse.jgit.lfs.lib;version="[4.8.0,4.9.0)",
org.eclipse.jgit.lfs.server.fs;version="[4.8.0,4.9.0)",

36
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
Unescape View File

@ -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="1491140572">
<target name="jgit-4.5" sequenceNumber="1494529263">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.client.source" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.continuation" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.continuation.source" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.http" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.http.source" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.io" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.io.source" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.security" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.security.source" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.server" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.server.source" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.servlet" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.servlet.source" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.util" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.util.source" version="9.3.17.v20170317"/>
<repository id="jetty-9.3.17" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.3.17.v20170317/"/>
<unit id="org.eclipse.jetty.client" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.client.source" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.continuation" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.continuation.source" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.http" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.http.source" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.io" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.io.source" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.security" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.security.source" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.server" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.server.source" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.servlet" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.servlet.source" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.util" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.util.source" version="9.4.5.v20170502"/>
<repository id="jetty-9.4.5" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.5.v20170502/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.apache.ant" version="1.9.4.v201504302020"/>

2
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd
Unescape View File

@ -1,6 +1,6 @@
target "jgit-4.5" with source configurePhase
include "projects/jetty-9.3.17.tpd"
include "projects/jetty-9.4.5.tpd"
include "orbit/R20160221192158-Mars.tpd"
include "orbit/S20170306214312-Oxygen.tpd"

36
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
Unescape View File

@ -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="1491140561">
<target name="jgit-4.6" sequenceNumber="1494529259">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.client.source" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.continuation" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.continuation.source" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.http" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.http.source" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.io" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.io.source" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.security" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.security.source" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.server" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.server.source" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.servlet" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.servlet.source" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.util" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.util.source" version="9.3.17.v20170317"/>
<repository id="jetty-9.3.17" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.3.17.v20170317/"/>
<unit id="org.eclipse.jetty.client" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.client.source" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.continuation" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.continuation.source" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.http" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.http.source" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.io" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.io.source" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.security" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.security.source" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.server" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.server.source" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.servlet" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.servlet.source" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.util" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.util.source" version="9.4.5.v20170502"/>
<repository id="jetty-9.4.5" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.5.v20170502/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.apache.ant" version="1.9.6.v201510161327"/>

2
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd
Unescape View File

@ -1,6 +1,6 @@
target "jgit-4.6" with source configurePhase
include "projects/jetty-9.3.17.tpd"
include "projects/jetty-9.4.5.tpd"
include "orbit/S20170306214312-Oxygen.tpd"
location "http://download.eclipse.org/releases/neon/" {

34
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
Unescape View File

@ -4,23 +4,23 @@
<target name="jgit-4.7" sequenceNumber="1491140544">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.client.source" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.continuation" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.continuation.source" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.http" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.http.source" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.io" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.io.source" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.security" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.security.source" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.server" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.server.source" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.servlet" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.servlet.source" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.util" version="9.3.17.v20170317"/>
<unit id="org.eclipse.jetty.util.source" version="9.3.17.v20170317"/>
<repository id="jetty-9.3.17" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.3.17.v20170317/"/>
<unit id="org.eclipse.jetty.client" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.client.source" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.continuation" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.continuation.source" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.http" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.http.source" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.io" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.io.source" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.security" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.security.source" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.server" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.server.source" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.servlet" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.servlet.source" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.util" version="9.4.5.v20170502"/>
<unit id="org.eclipse.jetty.util.source" version="9.4.5.v20170502"/>
<repository id="jetty-9.4.5" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.5.v20170502/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.apache.ant" version="1.9.6.v201510161327"/>

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd
Unescape View File

@ -1,8 +1,8 @@
target "jgit-4.7" with source configurePhase
include "projects/jetty-9.3.17.tpd"
include "projects/jetty-9.4.5.tpd"
include "orbit/S20170306214312-Oxygen.tpd"
location "http://download.eclipse.org/releases/oxygen/" {
org.eclipse.osgi lazy
}
}

20
org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.3.17.tpd
Unescape View File

@ -1,20 +0,0 @@
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]
}

20
org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.3.9.tpd
Unescape View File

@ -1,20 +0,0 @@
target "jetty-9.4.3" with source configurePhase
location jetty-9.4.3 "http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.3.9.v20160517/" {
org.eclipse.jetty.client [9.3.9.v20160517,9.3.9.v20160517]
org.eclipse.jetty.client.source [9.3.9.v20160517,9.3.9.v20160517]
org.eclipse.jetty.continuation [9.3.9.v20160517,9.3.9.v20160517]
org.eclipse.jetty.continuation.source [9.3.9.v20160517,9.3.9.v20160517]
org.eclipse.jetty.http [9.3.9.v20160517,9.3.9.v20160517]
org.eclipse.jetty.http.source [9.3.9.v20160517,9.3.9.v20160517]
org.eclipse.jetty.io [9.3.9.v20160517,9.3.9.v20160517]
org.eclipse.jetty.io.source [9.3.9.v20160517,9.3.9.v20160517]
org.eclipse.jetty.security [9.3.9.v20160517,9.3.9.v20160517]
org.eclipse.jetty.security.source [9.3.9.v20160517,9.3.9.v20160517]
org.eclipse.jetty.server [9.3.9.v20160517,9.3.9.v20160517]
org.eclipse.jetty.server.source [9.3.9.v20160517,9.3.9.v20160517]
org.eclipse.jetty.servlet [9.3.9.v20160517,9.3.9.v20160517]
org.eclipse.jetty.servlet.source [9.3.9.v20160517,9.3.9.v20160517]
org.eclipse.jetty.util [9.3.9.v20160517,9.3.9.v20160517]
org.eclipse.jetty.util.source [9.3.9.v20160517,9.3.9.v20160517]
}

20
org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.5.tpd
Unescape View File

@ -0,0 +1,20 @@
target "jetty-9.4.5" with source configurePhase
location jetty-9.4.5 "http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.5.v20170502/" {
org.eclipse.jetty.client [9.4.5.v20170502,9.4.5.v20170502]
org.eclipse.jetty.client.source [9.4.5.v20170502,9.4.5.v20170502]
org.eclipse.jetty.continuation [9.4.5.v20170502,9.4.5.v20170502]
org.eclipse.jetty.continuation.source [9.4.5.v20170502,9.4.5.v20170502]
org.eclipse.jetty.http [9.4.5.v20170502,9.4.5.v20170502]
org.eclipse.jetty.http.source [9.4.5.v20170502,9.4.5.v20170502]
org.eclipse.jetty.io [9.4.5.v20170502,9.4.5.v20170502]
org.eclipse.jetty.io.source [9.4.5.v20170502,9.4.5.v20170502]
org.eclipse.jetty.security [9.4.5.v20170502,9.4.5.v20170502]
org.eclipse.jetty.security.source [9.4.5.v20170502,9.4.5.v20170502]
org.eclipse.jetty.server [9.4.5.v20170502,9.4.5.v20170502]
org.eclipse.jetty.server.source [9.4.5.v20170502,9.4.5.v20170502]
org.eclipse.jetty.servlet [9.4.5.v20170502,9.4.5.v20170502]
org.eclipse.jetty.servlet.source [9.4.5.v20170502,9.4.5.v20170502]
org.eclipse.jetty.util [9.4.5.v20170502,9.4.5.v20170502]
org.eclipse.jetty.util.source [9.4.5.v20170502,9.4.5.v20170502]
}

28
org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
Unescape View File

@ -13,20 +13,20 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
org.apache.commons.compress.archivers.tar;version="[1.3,2.0)",
org.apache.commons.compress.archivers.zip;version="[1.3,2.0)",
org.apache.commons.logging;version="1.1.1",
org.eclipse.jetty.continuation;version="[9.0.0,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.jetty.continuation;version="[9.4.5,10.0.0)",
org.eclipse.jetty.http;version="[9.4.5,10.0.0)",
org.eclipse.jetty.io;version="[9.4.5,10.0.0)",
org.eclipse.jetty.security;version="[9.4.5,10.0.0)",
org.eclipse.jetty.security.authentication;version="[9.4.5,10.0.0)",
org.eclipse.jetty.server;version="[9.4.5,10.0.0)",
org.eclipse.jetty.server.handler;version="[9.4.5,10.0.0)",
org.eclipse.jetty.server.nio;version="[9.4.5,10.0.0)",
org.eclipse.jetty.servlet;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.component;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)",
org.eclipse.jgit.api;version="[4.8.0,4.9.0)",
org.eclipse.jgit.api.errors;version="[4.8.0,4.9.0)",
org.eclipse.jgit.archive;version="[4.8.0,4.9.0)",

2
pom.xml
Unescape View File

@ -204,7 +204,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.3.17.v20170317</jetty-version>
<jetty-version>9.4.5.v20170502</jetty-version>
<japicmp-version>0.8.1</japicmp-version>
<httpclient-version>4.3.6</httpclient-version>
<slf4j-version>1.7.2</slf4j-version>

Write Preview
Loading…
Cancel
Save