JGit Build: use jetty 7.1.6

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>

diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index 167ee1aa0e038f5519a08b314fea30d0fd0259ed..dac3c9aad5cec78b3771ca65e722260588249599 100644 (file)
--- 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 19a172288aba76e30fb12339bbf702816c889531..3824985dcdb8c8044c477872f0693ee911f19e74 100644 (file)
--- 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 6c45ae207a7f69495bd62f3d6fecd3d608890291..5bb5368859026dc0d13a3f57432dbc16e02550d7 100644 (file)
--- 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>