This reverts commit 24a0f47e32
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 <matthias.sohn@sap.com>
tags/v2.0.0.201206130900-r
@@ -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)", |
@@ -75,7 +75,7 @@ | |||
<dependency> | |||
<groupId>javax.servlet</groupId> | |||
<artifactId>javax.servlet-api</artifactId> | |||
<artifactId>servlet-api</artifactId> | |||
<scope>provided</scope> | |||
</dependency> | |||
</dependencies> |
@@ -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)" |
@@ -57,11 +57,9 @@ import java.io.IOException; | |||
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.HttpServletRequest; | |||
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.Ref; | |||
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 class SmartClientSmartServerTest extends HttpTestCase { | |||
public void destroy() { | |||
// | |||
} | |||
}), "/" + srcName + "/git-upload-pack", EnumSet | |||
.of(DispatcherType.REQUEST)); | |||
}), "/" + srcName + "/git-upload-pack", FilterMapping.DEFAULT); | |||
broken.addServlet(new ServletHolder(gs), "/*"); | |||
server.setUp(); |
@@ -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)" |
@@ -48,11 +48,11 @@ import java.util.ArrayList; | |||
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; |
@@ -75,11 +75,6 @@ | |||
<artifactId>org.eclipse.jgit.http.server</artifactId> | |||
<version>${project.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.servlet</groupId> | |||
<artifactId>javax.servlet-api</artifactId> | |||
<version>${servlet-api-version}</version> | |||
</dependency> | |||
</dependencies> | |||
</project> |
@@ -81,11 +81,6 @@ | |||
<artifactId>org.eclipse.jgit.http.server</artifactId> | |||
<version>${project.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.servlet</groupId> | |||
<artifactId>javax.servlet-api</artifactId> | |||
<version>${servlet-api-version}</version> | |||
</dependency> | |||
</dependencies> | |||
<build> |
@@ -60,9 +60,8 @@ | |||
<properties> | |||
<tycho-version>0.14.1</tycho-version> | |||
<jetty-version>7.6.0.v20120127</jetty-version> | |||
<eclipse-site>http://download.eclipse.org/releases/indigo</eclipse-site> | |||
<jetty-version>8.1.3.v20120416</jetty-version> | |||
<servlet-api-version>3.0.1</servlet-api-version> | |||
</properties> | |||
<modules> | |||
@@ -74,14 +73,14 @@ | |||
<repositories> | |||
<repository> | |||
<id>eclipse</id> | |||
<id>indigo</id> | |||
<layout>p2</layout> | |||
<url>${eclipse-site}</url> | |||
</repository> | |||
<repository> | |||
<id>jetty</id> | |||
<layout>p2</layout> | |||
<url>http://download.eclipse.org/jetty/updates/jetty-bundles-8.x/${jetty-version}/</url> | |||
<url>http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/${jetty-version}/</url> | |||
</repository> | |||
</repositories> | |||
@@ -158,11 +157,6 @@ | |||
<ws>win32</ws> | |||
<arch>x86_64</arch> | |||
</environment> | |||
<environment> | |||
<os>macosx</os> | |||
<ws>cocoa</ws> | |||
<arch>x86</arch> | |||
</environment> | |||
<environment> | |||
<os>macosx</os> | |||
<ws>cocoa</ws> |
@@ -172,8 +172,8 @@ | |||
<jsch-version>0.1.44-1</jsch-version> | |||
<junit-version>4.5</junit-version> | |||
<args4j-version>2.0.12</args4j-version> | |||
<servlet-api-version>3.0.1</servlet-api-version> | |||
<jetty-version>8.1.3.v20120416</jetty-version> | |||
<servlet-api-version>2.5</servlet-api-version> | |||
<jetty-version>7.6.0.v20120127</jetty-version> | |||
<protobuf-version>2.4.0a</protobuf-version> | |||
<clirr-version>2.3</clirr-version> | |||
</properties> | |||
@@ -184,8 +184,9 @@ | |||
<url>http://download.eclipse.org/jgit/maven</url> | |||
</repository> | |||
<repository> | |||
<id>jetty-repository</id> | |||
<url>http://download.eclipse.org/jetty/updates/jetty-bundles-8.x/${jetty-version}/</url> | |||
<id>jetty</id> | |||
<layout>p2</layout> | |||
<url>http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/${jetty-version}/</url> | |||
</repository> | |||
</repositories> | |||
@@ -401,7 +402,7 @@ | |||
<dependency> | |||
<groupId>javax.servlet</groupId> | |||
<artifactId>javax.servlet-api</artifactId> | |||
<artifactId>servlet-api</artifactId> | |||
<version>${servlet-api-version}</version> | |||
</dependency> | |||