From: Mat Booth Date: Thu, 11 May 2017 14:46:50 +0000 (+0100) Subject: Update jetty to 9.4.5 X-Git-Tag: v4.8.0.201705170830-rc1~10 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=33bbbc3c77eeee37a7b3d233f3c7be904948c5e7;p=jgit.git 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 Signed-off-by: Matthias Sohn --- diff --git a/WORKSPACE b/WORKSPACE index efa161b8ad..825157844a 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -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", ) diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index a7f7169755..22c6ca8669 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.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)", diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index c611b31b21..bf000aa31a 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.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)", 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 9ef4068cc4..28c0f21111 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,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 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); 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 415398da26..4e35ff6422 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 @@ -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))); } } 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 f78e8128eb..31d9669fc0 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.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)", 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 1d537e6d71..39224af545 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 ea4f5f629c..41ea154f92 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.17.tpd" +include "projects/jetty-9.4.5.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 babcf0928b..6cf40db025 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 b699452dfe..8c19a9547a 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.17.tpd" +include "projects/jetty-9.4.5.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 5e4f5558f2..7ccc03e83d 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 @@ -4,23 +4,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + 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 624b1191a9..b7ebc3202b 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,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 -} \ No newline at end of file +} 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 deleted file mode 100644 index 662df09f77..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.3.17.tpd +++ /dev/null @@ -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] -} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.3.9.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.3.9.tpd deleted file mode 100644 index d5621a07e3..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.3.9.tpd +++ /dev/null @@ -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] -} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.5.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.5.tpd new file mode 100644 index 0000000000..363c600cd1 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.5.tpd @@ -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] +} diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index df3406c545..efa7ed2615 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.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)", diff --git a/pom.xml b/pom.xml index 7a786f2aba..fb94dfe174 100644 --- a/pom.xml +++ b/pom.xml @@ -204,7 +204,7 @@ 1.6 4.3.1 3.1.0 - 9.3.17.v20170317 + 9.4.5.v20170502 0.8.1 4.3.6 1.7.2