diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2017-04-01 12:38:22 +0200 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2017-04-02 11:53:29 +0200 |
commit | 1b45b06116eee607152822d58103f5e4973d27b8 (patch) | |
tree | 7e054c151bde1d393b290852d999637331735fbf /org.eclipse.jgit.http.test | |
parent | ebc290a4a0066e631f37596761e648b2ef5df185 (diff) | |
download | jgit-1b45b06116eee607152822d58103f5e4973d27b8.tar.gz jgit-1b45b06116eee607152822d58103f5e4973d27b8.zip |
Update Jetty to 9.3.17.v20170317
Update to the latest 9.3 version until we have a solution for bug 514336
we face with 9.4.x versions.
Change-Id: I6d8d476abe8677ce865a08099bb77330effc700a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.http.test')
3 files changed, 18 insertions, 18 deletions
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)); } |