Set minimum Jetty version to 7.6

This reverts commit 0c6e7d71273b2b899f35e974d5a1463ce110fa7e which
didn't work since package imports need to be different with Jetty 7.5
and 7.6. Jetty 7.6 can be installed into Eclipse SDK 3.7.2 so rather
require Jetty 7.6 instead of adding a lot of reflective code to
workaround these incompatible changes.

Change-Id: I7eb6413ecf2bc4ad7bef0c70cde45ae3fde02b2f
Signed-off-by: Matthias Sohn <matthias.sohn@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 986810c4bb5518ad8529d460c131064f4c0d30dd..18b9d869d7501241b50aa787d24313a1f82c5387 100644 (file)
--- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
@@ -8,21 +8,20 @@ Bundle-Localization: plugin
 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)",
- 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;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.jetty.continuation;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.http;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.io;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.security;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.security.authentication;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.server;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.server.handler;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.server.nio;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.servlet;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.util;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.util.component;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.util.log;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.util.security;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.util.thread;version="[7.6.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)",

diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
index 5fc98e8dfb2f8f74758315a9a2533332d0f4a2f4..5413590f4f89363edf7617baf6cc775eb994292d 100644 (file)
--- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
@@ -9,19 +9,19 @@ Bundle-ActivationPolicy: lazy
 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)",
- 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.jetty.continuation;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.http;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.io;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.security;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.security.authentication;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.server;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.server.handler;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.server.nio;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.servlet;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.util.component;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.util.log;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.util.security;version="[7.6.0,8.0.0)",
+ org.eclipse.jetty.util.thread;version="[7.6.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)",