From 7395c7af59f9adf770a51748e03774d53c10ea97 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 27 Mar 2017 01:14:59 +0200 Subject: [PATCH] Require jetty 9.4.0 consistently Change-Id: If9de4c0e43850dec46858bd58e9692a7e099cbc3 --- .../META-INF/MANIFEST.MF | 24 +++++++++---------- .../META-INF/MANIFEST.MF | 17 ++++++------- .../META-INF/MANIFEST.MF | 24 +++++++++---------- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 24 +++++++++---------- 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 8e7d3510d..11a5d14df 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 9bf3c7494..c27b64216 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 7ccf0b332..a37f51a83 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 027fddf50..f0a36834c 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)",