Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2012-06-03 06:32:38 +0000
committerMatthias Sohn2012-06-03 06:32:38 +0000
commit447002b303063b5f0544b3f9d85e779cd2051f1f (patch)
tree2adb282cf12bcbf7e5f93b2002afd957e72b5c4f /pom.xml
parentac98c29df9e425fb8b951d47fe0a24bf11a2bbd3 (diff)
downloadjgit-447002b303063b5f0544b3f9d85e779cd2051f1f.tar.gz
jgit-447002b303063b5f0544b3f9d85e779cd2051f1f.tar.xz
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 'pom.xml')
-rw-r--r--pom.xml11
1 files changed, 6 insertions, 5 deletions
diff --git a/pom.xml b/pom.xml
index 60db93505a..cf744197d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>

Back to the top