From 447002b303063b5f0544b3f9d85e779cd2051f1f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 3 Jun 2012 08:32:38 +0200 Subject: [PATCH] Revert Jetty from 8.1.3.v20120416 to 7.6.0.v20120127 This reverts commit 24a0f47e32ab7cdf20c2201d7100599ea057f8a3 and updates JGit dependencies to use the latest available Jetty 7.x release. We can't use Jetty 8.x since it depends on Servlet API 3.0 which requires Java 6 but JGit still wants to support Java 5. Use one of the target platforms defined in Ibf67a6d3539fa0708a3e5dbe44fb899c56fbd8ed to work with that in Eclipse. Change-Id: I343273d994dc7b6e0287c604e5926ff77d5b585b Signed-off-by: Matthias Sohn --- .../META-INF/MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 27 +++++++++------- .../http/test/SmartClientSmartServerTest.java | 8 ++--- .../META-INF/MANIFEST.MF | 31 +++++++++---------- .../jgit/junit/http/TestRequestLog.java | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 5 --- .../org.eclipse.jgit.repository/pom.xml | 5 --- org.eclipse.jgit.packaging/pom.xml | 12 ++----- pom.xml | 11 ++++--- 10 files changed, 47 insertions(+), 60 deletions(-) diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 8588fd474..6c53e5944 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -11,8 +11,8 @@ Export-Package: org.eclipse.jgit.http.server.resolver;version="2.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: javax.servlet;version="[3.0.0,4.0.0)", - javax.servlet.http;version="[3.0.0,4.0.0)", +Import-Package: javax.servlet;version="[2.5.0,3.0.0)", + javax.servlet.http;version="[2.5.0,3.0.0)", org.eclipse.jgit.errors;version="[2.0.0,2.1.0)", org.eclipse.jgit.lib;version="[2.0.0,2.1.0)", org.eclipse.jgit.nls;version="[2.0.0,2.1.0)", diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index d82ecc0c8..ec2bfc271 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -75,7 +75,7 @@ javax.servlet - javax.servlet-api + servlet-api provided diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index e34892496..bb9d30477 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -6,16 +6,22 @@ Bundle-Version: 2.0.0.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: javax.servlet;version="[3.0.0,4.0.0)", - javax.servlet.http;version="[3.0.0,4.0.0)", - org.eclipse.jetty.continuation;version="[8.1.0,9.0.0)", - org.eclipse.jetty.client.security;version="[8.1.0,9.0.0)", - org.eclipse.jetty.http;version="[8.1.0,9)", - org.eclipse.jetty.http.ssl;version="[8.1.0,9.0.0)", - org.eclipse.jetty.io;version="[8.1.0,9)", - org.eclipse.jetty.server.handler;version="[8.1.0,9.0.0)", - org.eclipse.jetty.servlet;version="[8.1.0,9.0.0)", - org.eclipse.jetty.util;version="[8.1.0,9.0.0)", +Import-Package: javax.servlet;version="[2.5.0,3.0.0)", + javax.servlet.http;version="[2.5.0,3.0.0)", + org.eclipse.jetty.continuation;version="[7.1.0,8.0.0)", + org.eclipse.jetty.http;version="[7.1.0,8.0.0)", + org.eclipse.jetty.io;version="[7.1.0,8.0.0)", + org.eclipse.jetty.security;version="[7.1.0,8.0.0)", + org.eclipse.jetty.security.authentication;version="[7.1.0,8.0.0)", + org.eclipse.jetty.server;version="[7.1.0,8.0.0)", + org.eclipse.jetty.server.handler;version="[7.1.0,8.0.0)", + org.eclipse.jetty.server.nio;version="[7.1.0,8.0.0)", + org.eclipse.jetty.servlet;version="[7.1.0,8.0.0)", + org.eclipse.jetty.util;version="[7.1.0,8.0.0)", + org.eclipse.jetty.util.component;version="[7.1.0,8.0.0)", + org.eclipse.jetty.util.log;version="[7.1.0,8.0.0)", + org.eclipse.jetty.util.security;version="[7.1.0,8.0.0)", + org.eclipse.jetty.util.thread;version="[7.1.0,8.0.0)", org.eclipse.jgit.errors;version="[2.0.0,2.1.0)", org.eclipse.jgit.http.server;version="[2.0.0,2.1.0)", org.eclipse.jgit.http.server.glue;version="[2.0.0,2.1.0)", @@ -32,4 +38,3 @@ Import-Package: javax.servlet;version="[3.0.0,4.0.0)", org.eclipse.jgit.util;version="[2.0.0,2.1.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.0.0,5.0.0)" -Require-Bundle: org.eclipse.jetty.server;bundle-version="[8.1.0,9.0.0)" 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 4db7430ba..2a39c9f39 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 @@ -57,11 +57,9 @@ import java.io.PrintWriter; import java.net.URISyntaxException; import java.util.Collections; -import java.util.EnumSet; import java.util.List; import java.util.Map; -import javax.servlet.DispatcherType; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -72,6 +70,7 @@ import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.servlet.FilterHolder; +import org.eclipse.jetty.servlet.FilterMapping; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jgit.errors.RemoteRepositoryException; @@ -90,9 +89,9 @@ import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevBlob; import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.storage.file.ReflogEntry; import org.eclipse.jgit.storage.file.FileBasedConfig; import org.eclipse.jgit.storage.file.FileRepository; -import org.eclipse.jgit.storage.file.ReflogEntry; import org.eclipse.jgit.storage.file.ReflogReader; import org.eclipse.jgit.transport.FetchConnection; import org.eclipse.jgit.transport.HttpTransport; @@ -161,8 +160,7 @@ public void init(FilterConfig filterConfig) throws ServletException { public void destroy() { // } - }), "/" + srcName + "/git-upload-pack", EnumSet - .of(DispatcherType.REQUEST)); + }), "/" + srcName + "/git-upload-pack", FilterMapping.DEFAULT); broken.addServlet(new ServletHolder(gs), "/*"); server.setUp(); diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index e46a44943..5fc98e8df 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -7,21 +7,21 @@ Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: javax.servlet;version="[3.0.0,4.0.0)", - javax.servlet.http;version="[3.0.0,4.0.0)", - org.eclipse.jetty.client.security;version="[8.1.0,9.0.0)", - org.eclipse.jetty.http;version="[8.1.0,9.0.0)", - org.eclipse.jetty.http.ssl;version="[8.1.0,9.0.0)", - org.eclipse.jetty.io;version="[8.1.0,9.0.0)", - org.eclipse.jetty.security;version="[8.1.0,9.0.0)", - org.eclipse.jetty.security.authentication;version="[8.1.0,9.0.0)", - org.eclipse.jetty.server.handler;version="[8.1.0,9.0.0)", - org.eclipse.jetty.servlet;version="[8.1.0,9.0.0)", - org.eclipse.jetty.util;version="[8.1.0,9.0.0)", - org.eclipse.jetty.util.component;version="[8.1.0,9.0.0)", - org.eclipse.jetty.util.log;version="[8.1.0,9.0.0)", - org.eclipse.jetty.util.security;version="[8.1.0,9.0.0)", - org.eclipse.jetty.util.thread;version="[8.1.0,9.0.0)", +Import-Package: javax.servlet;version="[2.5.0,3.0.0)", + javax.servlet.http;version="[2.5.0,3.0.0)", + org.eclipse.jetty.continuation;version="[7.1.0,8.0.0)", + org.eclipse.jetty.http;version="[7.1.0,8.0.0)", + org.eclipse.jetty.io;version="[7.1.0,8.0.0)", + org.eclipse.jetty.security;version="[7.1.0,8.0.0)", + org.eclipse.jetty.security.authentication;version="[7.1.0,8.0.0)", + org.eclipse.jetty.server;version="[7.1.0,8.0.0)", + org.eclipse.jetty.server.handler;version="[7.1.0,8.0.0)", + org.eclipse.jetty.server.nio;version="[7.1.0,8.0.0)", + org.eclipse.jetty.servlet;version="[7.1.0,8.0.0)", + org.eclipse.jetty.util.component;version="[7.1.0,8.0.0)", + org.eclipse.jetty.util.log;version="[7.1.0,8.0.0)", + org.eclipse.jetty.util.security;version="[7.1.0,8.0.0)", + org.eclipse.jetty.util.thread;version="[7.1.0,8.0.0)", org.eclipse.jgit.errors;version="[2.0.0,2.1.0)", org.eclipse.jgit.http.server;version="[2.0.0,2.1.0)", org.eclipse.jgit.http.server.resolver;version="[2.0.0,2.1.0)", @@ -33,4 +33,3 @@ Import-Package: javax.servlet;version="[3.0.0,4.0.0)", org.eclipse.jgit.transport.resolver;version="[2.0.0,2.1.0)", org.junit;version="[4.0.0,5.0.0)" Export-Package: org.eclipse.jgit.junit.http;version="2.0.0" -Require-Bundle: org.eclipse.jetty.server;bundle-version="[8.1.0,9.0.0)" diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/TestRequestLog.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/TestRequestLog.java index 14ea03a92..f71bc9350 100644 --- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/TestRequestLog.java +++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/TestRequestLog.java @@ -48,11 +48,11 @@ import java.util.List; import java.util.concurrent.Semaphore; -import javax.servlet.DispatcherType; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.eclipse.jetty.server.DispatcherType; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Response; import org.eclipse.jetty.server.handler.HandlerWrapper; diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index c15dd1319..4c1aea78c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -75,11 +75,6 @@ org.eclipse.jgit.http.server ${project.version} - - javax.servlet - javax.servlet-api - ${servlet-api-version} - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index ed4ea9820..e87f4498d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -81,11 +81,6 @@ org.eclipse.jgit.http.server ${project.version} - - javax.servlet - javax.servlet-api - ${servlet-api-version} - diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 1b7759a02..d3a956307 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -60,9 +60,8 @@ 0.14.1 + 7.6.0.v20120127 http://download.eclipse.org/releases/indigo - 8.1.3.v20120416 - 3.0.1 @@ -74,14 +73,14 @@ - eclipse + indigo p2 ${eclipse-site} jetty p2 - http://download.eclipse.org/jetty/updates/jetty-bundles-8.x/${jetty-version}/ + http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/${jetty-version}/ @@ -158,11 +157,6 @@ win32 x86_64 - - macosx - cocoa - x86 - macosx cocoa diff --git a/pom.xml b/pom.xml index 60db93505..cf744197d 100644 --- a/pom.xml +++ b/pom.xml @@ -172,8 +172,8 @@ 0.1.44-1 4.5 2.0.12 - 3.0.1 - 8.1.3.v20120416 + 2.5 + 7.6.0.v20120127 2.4.0a 2.3 @@ -184,8 +184,9 @@ http://download.eclipse.org/jgit/maven - jetty-repository - http://download.eclipse.org/jetty/updates/jetty-bundles-8.x/${jetty-version}/ + jetty + p2 + http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/${jetty-version}/ @@ -401,7 +402,7 @@ javax.servlet - javax.servlet-api + servlet-api ${servlet-api-version}