diff options
16 files changed, 147 insertions, 147 deletions
diff --git a/lib/jetty/BUCK b/lib/jetty/BUCK index 6e7dec3062..fbb37c1e6a 100644 --- a/lib/jetty/BUCK +++ b/lib/jetty/BUCK @@ -1,10 +1,10 @@ -VERSION = '9.2.13.v20150730' +VERSION = '9.3.17.v20170317' GROUP = 'org.eclipse.jetty' maven_jar( name = 'servlet', - bin_sha1 = '5ad6e38015a97ae9a60b6c2ad744ccfa9cf93a50', - src_sha1 = '78fbec19321150552d91f9e079c2f2ca33222b01', + bin_sha1 = 'ed6986b0d0ca7b9b0f9015c9efb80442e3043a8e', + src_sha1 = 'ee6b4784a00a92e5c1b6111033b7ae41ac6052a3', group = GROUP, artifact = 'jetty-servlet', version = VERSION, @@ -12,8 +12,8 @@ maven_jar( maven_jar( name = 'security', - bin_sha1 = 'cc7c7f27ec4cc279253be1675d9e47e58b995943', - src_sha1 = '75632ebdf8bd651faafb97106c92496db59e165d', + bin_sha1 = 'ca52535569445682d42aaa97c7039442719a0507', + src_sha1 = '2ff9f4fb18b320fd5a0272a427bacc4d5fe7bc86', group = GROUP, artifact = 'jetty-security', version = VERSION, @@ -21,8 +21,8 @@ maven_jar( maven_jar( name = 'server', - bin_sha1 = '5be7d1da0a7abffd142de3091d160717c120b6ab', - src_sha1 = '203e123f83efe2a5b8a9c74854c7897fe3563302', + bin_sha1 = '194e9a02e6ba249ef4a3f4bd56b4993087992299', + src_sha1 = '0c9bd572f530c411592aefb71781ecca0b3719a9', group = GROUP, artifact = 'jetty-server', version = VERSION, @@ -30,8 +30,8 @@ maven_jar( maven_jar( name = 'http', - bin_sha1 = '23a745d9177ef67ef53cc46b9b70c5870082efc2', - src_sha1 = '5f87f7ff2057cd4b0995bc4fffe17b2aff64c130', + bin_sha1 = '6c02d728e15d4868486254039c867a1ac3e4a52e', + src_sha1 = '3c0a2a82792f268631b4fefd77be9f126ec974b1', group = GROUP, artifact = 'jetty-http', version = VERSION, @@ -39,8 +39,8 @@ maven_jar( maven_jar( name = 'io', - bin_sha1 = '7a351e6a1b63dfd56b6632623f7ca2793ffb67ad', - src_sha1 = 'bbd61a84b748fc295456e1c5c3070aaf40a68f62', + bin_sha1 = '756a8cd2a1cbfb84a94973b6332dd3eccd47c0cd', + src_sha1 = 'a9afa99cccb19b441364fa805d027f457cbbb136', group = GROUP, artifact = 'jetty-io', version = VERSION, @@ -48,8 +48,8 @@ maven_jar( maven_jar( name = 'util', - bin_sha1 = 'c101476360a7cdd0670462de04053507d5e70c97', - src_sha1 = '15ceecce141971b4e0facb861b3d10120ad6ce03', + bin_sha1 = 'b8512ab02819de01f0f5a5c6026163041f579beb', + src_sha1 = '96f8e3dcdc3660a5c91f19c46695daa70ac95625', group = GROUP, artifact = 'jetty-util', version = VERSION, diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 9c98521dbc..6effed6f95 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,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.jetty.continuation;version="[9.0.0,9.4.0)", + org.eclipse.jetty.http;version="[9.0.0,9.4.0)", + org.eclipse.jetty.io;version="[9.0.0,9.4.0)", + org.eclipse.jetty.security;version="[9.0.0,9.4.0)", + org.eclipse.jetty.security.authentication;version="[9.0.0,9.4.0)", + org.eclipse.jetty.server;version="[9.0.0,9.4.0)", + org.eclipse.jetty.server.handler;version="[9.0.0,9.4.0)", + org.eclipse.jetty.server.nio;version="[9.0.0,9.4.0)", + org.eclipse.jetty.servlet;version="[9.0.0,9.4.0)", + org.eclipse.jetty.util;version="[9.0.0,9.4.0)", + org.eclipse.jetty.util.component;version="[9.0.0,9.4.0)", + org.eclipse.jetty.util.log;version="[9.0.0,9.4.0)", + org.eclipse.jetty.util.security;version="[9.0.0,9.4.0)", + org.eclipse.jetty.util.thread;version="[9.0.0,9.4.0)", org.eclipse.jgit.errors;version="[4.6.2,4.7.0)", org.eclipse.jgit.http.server;version="[4.6.2,4.7.0)", org.eclipse.jgit.http.server.glue;version="[4.6.2,4.7.0)", diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java index da3a09809b..bce44f9bf3 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java @@ -199,7 +199,7 @@ public class DumbClientSmartServerTest extends HttpTestCase { .startsWith("JGit/")); assertEquals("*/*", info.getRequestHeader(HDR_ACCEPT)); assertEquals(200, info.getStatus()); - assertEquals("text/plain; charset=UTF-8", + assertEquals("text/plain;charset=utf-8", info .getResponseHeader(HDR_CONTENT_TYPE)); @@ -269,7 +269,7 @@ public class DumbClientSmartServerTest extends HttpTestCase { 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", + assertEquals("text/plain;charset=utf-8", req.get(0).getResponseHeader( HDR_CONTENT_TYPE)); } diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java index 2b9105cfe7..3e882719b3 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java @@ -454,7 +454,7 @@ public class SmartClientSmartServerTest extends HttpTestCase { } catch (TransportException err) { String exp = brokenURI + ": expected" + " Content-Type application/x-git-upload-pack-result;" - + " received Content-Type text/plain; charset=UTF-8"; + + " received Content-Type text/plain;charset=utf-8"; assertEquals(exp, err.getMessage()); } } @@ -476,7 +476,7 @@ public class SmartClientSmartServerTest extends HttpTestCase { assertEquals(join(brokenURI, "git-upload-pack"), service.getPath()); assertEquals(0, service.getParameters().size()); assertEquals(200, service.getStatus()); - assertEquals("text/plain; charset=UTF-8", + assertEquals("text/plain;charset=utf-8", service.getResponseHeader(HDR_CONTENT_TYPE)); } diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index e8b4d06e69..cd42e2c117 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,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.jetty.http;version="[9.0.0,9.4.0)", + org.eclipse.jetty.security;version="[9.0.0,9.4.0)", + org.eclipse.jetty.security.authentication;version="[9.0.0,9.4.0)", + org.eclipse.jetty.server;version="[9.0.0,9.4.0)", + org.eclipse.jetty.server.handler;version="[9.0.0,9.4.0)", + org.eclipse.jetty.server.nio;version="[9.0.0,9.4.0)", + org.eclipse.jetty.servlet;version="[9.0.0,9.4.0)", + org.eclipse.jetty.util.component;version="[9.0.0,9.4.0)", + org.eclipse.jetty.util.log;version="[9.0.0,9.4.0)", + org.eclipse.jetty.util.security;version="[9.0.0,9.4.0)", org.eclipse.jgit.errors;version="[4.6.2,4.7.0)", org.eclipse.jgit.http.server;version="[4.6.2,4.7.0)", org.eclipse.jgit.internal.storage.file;version="[4.6.2,4.7.0)", 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 a18eaa1929..405e07a725 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,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.jetty.continuation;version="[9.0.0,9.4.0)", + org.eclipse.jetty.http;version="[9.0.0,9.4.0)", + org.eclipse.jetty.io;version="[9.0.0,9.4.0)", + org.eclipse.jetty.security;version="[9.0.0,9.4.0)", + org.eclipse.jetty.security.authentication;version="[9.0.0,9.4.0)", + org.eclipse.jetty.server;version="[9.0.0,9.4.0)", + org.eclipse.jetty.server.handler;version="[9.0.0,9.4.0)", + org.eclipse.jetty.server.nio;version="[9.0.0,9.4.0)", + org.eclipse.jetty.servlet;version="[9.0.0,9.4.0)", + org.eclipse.jetty.util;version="[9.0.0,9.4.0)", + org.eclipse.jetty.util.component;version="[9.0.0,9.4.0)", + org.eclipse.jetty.util.log;version="[9.0.0,9.4.0)", + org.eclipse.jetty.util.security;version="[9.0.0,9.4.0)", + org.eclipse.jetty.util.thread;version="[9.0.0,9.4.0)", org.eclipse.jgit.junit.http;version="[4.6.2,4.7.0)", org.eclipse.jgit.lfs.lib;version="[4.6.2,4.7.0)", org.eclipse.jgit.lfs.server.fs;version="[4.6.2,4.7.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 f30bc2fa7e..85585e804a 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 @@ <?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="1484987843"> +<target name="jgit-4.5" sequenceNumber="1490949900"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.client.source" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.continuation" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.http" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.http.source" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.io" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.io.source" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.security" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.security.source" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.server" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.server.source" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.servlet" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.util" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.util.source" version="9.2.13.v20150730"/> - <repository id="jetty-9.2.13" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.2.13.v20150730/"/> + <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/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.apache.ant" version="1.9.4.v201504302020"/> 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 ba7a694b43..77d3e89ee5 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.2.13.tpd" +include "projects/jetty-9.3.17.tpd" include "orbit/R20160221192158-Mars.tpd" include "orbit/S20170120205402-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 163ab2c263..a51b4559d3 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 @@ <?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="1484987839"> +<target name="jgit-4.6" sequenceNumber="1490949887"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.client.source" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.continuation" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.http" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.http.source" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.io" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.io.source" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.security" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.security.source" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.server" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.server.source" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.servlet" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.util" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.util.source" version="9.2.13.v20150730"/> - <repository id="jetty-9.2.13" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.2.13.v20150730/"/> + <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/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.apache.ant" version="1.9.6.v201510161327"/> 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 d07687815f..913f661245 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.2.13.tpd" +include "projects/jetty-9.3.17.tpd" include "orbit/S20170120205402-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 fa173e7b28..541ce04ced 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target @@ -1,26 +1,26 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="jgit-4.7" sequenceNumber="1484987834"> +<target name="jgit-4.7" sequenceNumber="1490949871"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.client.source" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.continuation" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.http" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.http.source" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.io" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.io.source" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.security" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.security.source" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.server" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.server.source" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.servlet" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.util" version="9.2.13.v20150730"/> - <unit id="org.eclipse.jetty.util.source" version="9.2.13.v20150730"/> - <repository id="jetty-9.2.13" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.2.13.v20150730/"/> + <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/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.apache.ant" version="1.9.6.v201510161327"/> 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 4cd9e2b740..0ce8a9a0b3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd @@ -1,6 +1,6 @@ target "jgit-4.7" with source configurePhase -include "projects/jetty-9.2.13.tpd" +include "projects/jetty-9.3.17.tpd" include "orbit/S20170120205402-Oxygen.tpd" location "http://download.eclipse.org/releases/oxygen/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.2.13.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.2.13.tpd deleted file mode 100644 index 289a73d2ae..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.2.13.tpd +++ /dev/null @@ -1,20 +0,0 @@ -target "jetty-9.2.13" with source configurePhase - -location jetty-9.2.13 "http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.2.13.v20150730/" { - org.eclipse.jetty.client [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.client.source [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.continuation [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.continuation.source [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.http [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.http.source [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.io [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.io.source [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.security [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.security.source [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.server [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.server.source [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.servlet [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.servlet.source [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.util [9.2.13.v20150730,9.2.13.v20150730] - org.eclipse.jetty.util.source [9.2.13.v20150730,9.2.13.v20150730] -} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.3.17.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.3.17.tpd new file mode 100644 index 0000000000..662df09f77 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.3.17.tpd @@ -0,0 +1,20 @@ +target "jetty-9.3.17" with source configurePhase + +location jetty-9.3.17 "http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.3.17.v20170317/" { + org.eclipse.jetty.client [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.client.source [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.continuation [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.continuation.source [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.http [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.http.source [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.io [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.io.source [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.security [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.security.source [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.server [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.server.source [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.servlet [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.servlet.source [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.util [9.3.17.v20170317,9.3.17.v20170317] + org.eclipse.jetty.util.source [9.3.17.v20170317,9.3.17.v20170317] +} diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 24b526217b..5c30da7547 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,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.jetty.continuation;version="[9.0.0,9.4.0)", + org.eclipse.jetty.http;version="[9.0.0,9.4.0)", + org.eclipse.jetty.io;version="[9.0.0,9.4.0)", + org.eclipse.jetty.security;version="[9.0.0,9.4.0)", + org.eclipse.jetty.security.authentication;version="[9.0.0,9.4.0)", + org.eclipse.jetty.server;version="[9.0.0,9.4.0)", + org.eclipse.jetty.server.handler;version="[9.0.0,9.4.0)", + org.eclipse.jetty.server.nio;version="[9.0.0,9.4.0)", + org.eclipse.jetty.servlet;version="[9.0.0,9.4.0)", + org.eclipse.jetty.util;version="[9.0.0,9.4.0)", + org.eclipse.jetty.util.component;version="[9.0.0,9.4.0)", + org.eclipse.jetty.util.log;version="[9.0.0,9.4.0)", + org.eclipse.jetty.util.security;version="[9.0.0,9.4.0)", + org.eclipse.jetty.util.thread;version="[9.0.0,9.4.0)", org.eclipse.jgit.api;version="[4.6.2,4.7.0)", org.eclipse.jgit.api.errors;version="[4.6.2,4.7.0)", org.eclipse.jgit.archive;version="[4.6.2,4.7.0)", @@ -200,7 +200,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.2.13.v20150730</jetty-version> + <jetty-version>9.3.17.v20170317</jetty-version> <japicmp-version>0.5.3</japicmp-version> <httpclient-version>4.3.6</httpclient-version> <slf4j-version>1.7.2</slf4j-version> |