summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.http.test/META-INF
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2018-12-25 00:49:46 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2018-12-25 00:54:15 +0100
commitaffbb99271b7307c2e30795b561fb08a850f56c1 (patch)
treeb783bf599ab13ae62a1a9d09268a1b9bb0c6a141 /org.eclipse.jgit.http.test/META-INF
parentdf6263644bb3387239cd77aa57074380610a0ec4 (diff)
parent60a606a2615ac4340c3eb4d288bcd8d887cd1f0c (diff)
downloadjgit-affbb99271b7307c2e30795b561fb08a850f56c1.tar.gz
jgit-affbb99271b7307c2e30795b561fb08a850f56c1.zip
Merge branch 'stable-4.10' into stable-4.11
* stable-4.10: Prepare 4.9.9-SNAPSHOT builds JGit v4.9.8.201812241815-r UploadPack: Test filtering by AdvertiseRefsHook in stateless transports Prepare 4.7.8-SNAPSHOT builds JGit v4.7.7.201812240805-r Fix feature versions imported by feature org.eclipse.jgit.pgm Prepare 4.5.6-SNAPSHOT builds JGit v4.5.5.201812240535-r Call AdvertiseRefsHook before validating wants Change-Id: I937e9a4547fc10e4de7c887163022d1ab0322d64 Signed-off-by: Jonathan Nieder <jrn@google.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.http.test/META-INF')
-rw-r--r--org.eclipse.jgit.http.test/META-INF/MANIFEST.MF6
1 files changed, 4 insertions, 2 deletions
diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index 5af6bd7275..390b8cccef 100644
--- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
@@ -9,8 +9,8 @@ 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.apache.commons.codec;version="[1.6.0, 2.0.0)",
- org.apache.commons.codec.binary;version="[1.6.0, 2.0.0)",
+ org.apache.commons.codec;version="[1.6.0,2.0.0)",
+ org.apache.commons.codec.binary;version="[1.6.0,2.0.0)",
org.eclipse.jetty.continuation;version="[9.4.5,10.0.0)",
org.eclipse.jetty.http;version="[9.4.5,10.0.0)",
org.eclipse.jetty.io;version="[9.4.5,10.0.0)",
@@ -46,5 +46,7 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
org.eclipse.jgit.util;version="[4.11.6,4.12.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.12,5.0.0)",
+ org.junit.rules;version="[4.12,5.0.0)",
org.junit.runner;version="[4.12,5.0.0)",
org.junit.runners;version="[4.12,5.0.0)"
+Require-Bundle: org.hamcrest.library;bundle-version="[1.1.0,2.0.0)"