summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2017-03-27 01:14:59 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2017-03-30 13:56:16 +0200
commit7395c7af59f9adf770a51748e03774d53c10ea97 (patch)
tree0c713e70d38acfab8f0018ab74b307757dc3026e
parentf32d65759c9afdcbec28eb3051ed9138b8e03271 (diff)
downloadjgit-7395c7af59f9adf770a51748e03774d53c10ea97.tar.gz
jgit-7395c7af59f9adf770a51748e03774d53c10ea97.zip
Require jetty 9.4.0 consistently
Change-Id: If9de4c0e43850dec46858bd58e9692a7e099cbc3
-rw-r--r--org.eclipse.jgit.http.test/META-INF/MANIFEST.MF24
-rw-r--r--org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF17
-rw-r--r--org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF24
-rw-r--r--org.eclipse.jgit.pgm/META-INF/MANIFEST.MF24
4 files changed, 45 insertions, 44 deletions
diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index 8e7d3510d7..11a5d14df0 100644
--- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
@@ -8,20 +8,20 @@ Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
javax.servlet.http;version="[2.5.0,3.2.0)",
- org.eclipse.jetty.continuation;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.http;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.io;version="[9.0.0,10.0.0)",
+ org.eclipse.jetty.continuation;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.http;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.io;version="[9.4.0,10.0.0)",
org.eclipse.jetty.security;version="[9.4.0,10.0.0)",
org.eclipse.jetty.security.authentication;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.server;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.server.handler;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.server.nio;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.servlet;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util.component;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util.thread;version="[9.0.0,10.0.0)",
+ org.eclipse.jetty.server;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.server.handler;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.server.nio;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.servlet;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util.component;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util.log;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util.security;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util.thread;version="[9.4.0,10.0.0)",
org.eclipse.jgit.errors;version="[4.7.0,4.8.0)",
org.eclipse.jgit.http.server;version="[4.7.0,4.8.0)",
org.eclipse.jgit.http.server.glue;version="[4.7.0,4.8.0)",
diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
index 9bf3c74941..c27b642169 100644
--- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
@@ -10,16 +10,16 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
javax.servlet.http;version="[2.5.0,3.2.0)",
org.apache.commons.logging;version="[1.1.1,2.0.0)",
- org.eclipse.jetty.http;version="[9.0.0,10.0.0)",
+ org.eclipse.jetty.http;version="[9.4.0,10.0.0)",
org.eclipse.jetty.security;version="[9.4.0,10.0.0)",
org.eclipse.jetty.security.authentication;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.server;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.server.handler;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.server.nio;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.servlet;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util.component;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)",
+ org.eclipse.jetty.server;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.server.handler;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.server.nio;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.servlet;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util.component;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util.log;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util.security;version="[9.4.0,10.0.0)",
org.eclipse.jgit.errors;version="[4.7.0,4.8.0)",
org.eclipse.jgit.http.server;version="[4.7.0,4.8.0)",
org.eclipse.jgit.internal.storage.file;version="[4.7.0,4.8.0)",
@@ -37,6 +37,7 @@ Export-Package: org.eclipse.jgit.junit.http;version="4.7.0";
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.eclipse.jetty.server.handler,
+ org.eclipse.jetty.security,
javax.servlet,
org.eclipse.jetty.server,
org.eclipse.jetty.util.log,
diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
index 7ccf0b3329..a37f51a831 100644
--- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
@@ -13,20 +13,20 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
org.apache.http.client.methods;version="[4.3.0,5.0.0)",
org.apache.http.entity;version="[4.3.0,5.0.0)",
org.apache.http.impl.client;version="[4.3.0,5.0.0)",
- org.eclipse.jetty.continuation;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.http;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.io;version="[9.0.0,10.0.0)",
+ org.eclipse.jetty.continuation;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.http;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.io;version="[9.4.0,10.0.0)",
org.eclipse.jetty.security;version="[9.4.0,10.0.0)",
org.eclipse.jetty.security.authentication;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.server;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.server.handler;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.server.nio;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.servlet;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util.component;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util.thread;version="[9.0.0,10.0.0)",
+ org.eclipse.jetty.server;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.server.handler;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.server.nio;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.servlet;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util.component;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util.log;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util.security;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util.thread;version="[9.4.0,10.0.0)",
org.eclipse.jgit.junit.http;version="[4.7.0,4.8.0)",
org.eclipse.jgit.lfs.lib;version="[4.7.0,4.8.0)",
org.eclipse.jgit.lfs.server.fs;version="[4.7.0,4.8.0)",
diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index 027fddf50d..f0a36834cd 100644
--- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
@@ -13,20 +13,20 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
org.apache.commons.compress.archivers.tar;version="[1.3,2.0)",
org.apache.commons.compress.archivers.zip;version="[1.3,2.0)",
org.apache.commons.logging;version="1.1.1",
- org.eclipse.jetty.continuation;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.http;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.io;version="[9.0.0,10.0.0)",
+ org.eclipse.jetty.continuation;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.http;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.io;version="[9.4.0,10.0.0)",
org.eclipse.jetty.security;version="[9.4.0,10.0.0)",
org.eclipse.jetty.security.authentication;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.server;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.server.handler;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.server.nio;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.servlet;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util.component;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util.thread;version="[9.0.0,10.0.0)",
+ org.eclipse.jetty.server;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.server.handler;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.server.nio;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.servlet;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util.component;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util.log;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util.security;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util.thread;version="[9.4.0,10.0.0)",
org.eclipse.jgit.api;version="[4.7.0,4.8.0)",
org.eclipse.jgit.api.errors;version="[4.7.0,4.8.0)",
org.eclipse.jgit.archive;version="[4.7.0,4.8.0)",