summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorJens Baumgart2010-12-09 04:42:05 (EST)
committer Jens Baumgart2010-12-09 04:42:05 (EST)
commitc0b49c1366ae429eedc724d5b34c6d41ae249fcf (patch)
tree7d1093cf9be2bf99bf218f2f603597530552f533
parent18abb8195a67a0502a71e2420078dd95563e18c6 (diff)
downloadjgit-c0b49c1366ae429eedc724d5b34c6d41ae249fcf.zip
jgit-c0b49c1366ae429eedc724d5b34c6d41ae249fcf.tar.gz
jgit-c0b49c1366ae429eedc724d5b34c6d41ae249fcf.tar.bz2
JGit Build: use jetty 7.1.6refs/changes/93/2093/1
Jetty 7.1.6 is used because this version is also available in P2. Change-Id: I410fbca8592cac6e58c651c4d086573820e777a5 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
-rw-r--r--org.eclipse.jgit.http.test/META-INF/MANIFEST.MF26
-rw-r--r--org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF18
-rw-r--r--pom.xml2
3 files changed, 27 insertions, 19 deletions
diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index 167ee1a..dac3c9a 100644
--- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
@@ -9,19 +9,19 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: javax.servlet;version="[2.5.0,3.0.0)",
javax.servlet.http;version="[2.5.0,3.0.0)",
junit.framework;version="[3.8.2,4.0.0)",
- org.eclipse.jetty.continuation;version="[7.0.1,8.0.0)",
- org.eclipse.jetty.http;version="[7.0.1,8.0.0)",
- org.eclipse.jetty.http.security;version="[7.0.1,8.0.0)",
- org.eclipse.jetty.io;version="[7.0.1,8.0.0)",
- org.eclipse.jetty.security;version="[7.0.1,8.0.0)",
- org.eclipse.jetty.security.authentication;version="[7.0.1,8.0.0)",
- org.eclipse.jetty.server;version="[7.0.1,8.0.0)",
- org.eclipse.jetty.server.handler;version="[7.0.1,8.0.0)",
- org.eclipse.jetty.server.nio;version="[7.0.1,8.0.0)",
- org.eclipse.jetty.servlet;version="[7.0.1,8.0.0)",
- org.eclipse.jetty.util.component;version="[7.0.1,8.0.0)",
- org.eclipse.jetty.util.log;version="[7.0.1,8.0.0)",
- org.eclipse.jetty.util.thread;version="[7.0.1,8.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.http.security;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.thread;version="[7.1.0,8.0.0)",
org.eclipse.jgit;version="[0.10.0,0.11.0)",
org.eclipse.jgit.errors;version="[0.10.0,0.11.0)",
org.eclipse.jgit.http.server;version="[0.10.0,0.11.0)",
diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
index 19a1722..3824985 100644
--- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
@@ -10,6 +10,19 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: javax.servlet;version="[2.5.0,3.0.0)",
javax.servlet.http;version="[2.5.0,3.0.0)",
junit.framework;version="[3.8.2,4.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.http.security;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.thread;version="[7.1.0,8.0.0)",
org.eclipse.jgit.errors;version="[0.10.0,0.11.0)",
org.eclipse.jgit.http.server;version="[0.10.0,0.11.0)",
org.eclipse.jgit.http.server.resolver;version="[0.10.0,0.11.0)",
@@ -19,8 +32,3 @@ Import-Package: javax.servlet;version="[2.5.0,3.0.0)",
org.eclipse.jgit.storage.file;version="[0.10.0,0.11.0)",
org.eclipse.jgit.transport;version="[0.10.0,0.11.0)"
Export-Package: org.eclipse.jgit.junit.http;version="0.10.0"
-Require-Bundle: org.eclipse.jetty.http;bundle-version="7.0.1",
- org.eclipse.jetty.server;bundle-version="7.0.1",
- org.eclipse.jetty.servlet;bundle-version="7.0.1",
- org.eclipse.jetty.util;bundle-version="7.0.1",
- org.eclipse.jetty.security;bundle-version="7.0.1"
diff --git a/pom.xml b/pom.xml
index 6c45ae2..5bb5368 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@
<junit-version>3.8.2</junit-version>
<args4j-version>2.0.12</args4j-version>
<servlet-api-version>2.5</servlet-api-version>
- <jetty-version>7.1.1.v20100517</jetty-version>
+ <jetty-version>7.1.6.v20100715</jetty-version>
</properties>
<pluginRepositories>