diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2012-06-03 08:32:38 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2012-06-03 08:32:38 +0200 |
| commit | 447002b303063b5f0544b3f9d85e779cd2051f1f (patch) | |
| tree | 2adb282cf12bcbf7e5f93b2002afd957e72b5c4f /org.eclipse.jgit.packaging | |
| parent | ac98c29df9e425fb8b951d47fe0a24bf11a2bbd3 (diff) | |
| download | jgit-447002b303063b5f0544b3f9d85e779cd2051f1f.tar.gz jgit-447002b303063b5f0544b3f9d85e779cd2051f1f.zip | |
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 <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.packaging')
| -rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml | 5 | ||||
| -rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml | 5 | ||||
| -rw-r--r-- | org.eclipse.jgit.packaging/pom.xml | 12 |
3 files changed, 3 insertions, 19 deletions
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 c15dd13192..4c1aea78c9 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 @@ <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> 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 ed4ea98207..e87f4498da 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 @@ <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> diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 1b7759a021..d3a9563077 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -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> @@ -161,11 +160,6 @@ <environment> <os>macosx</os> <ws>cocoa</ws> - <arch>x86</arch> - </environment> - <environment> - <os>macosx</os> - <ws>cocoa</ws> <arch>x86_64</arch> </environment> </environments> |