aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Rosenberg <robin.rosenberg@dewire.com>2011-01-01 19:05:00 +0100
committerRobin Rosenberg <robin.rosenberg@dewire.com>2011-01-01 19:05:00 +0100
commitff7149fb95d11e26e3409903a19cfde7df3ff90e (patch)
treefdf2cdaac5c77481507f9a8ba23c33ee822bb5ac
parent9a3ce780fc3132189fa0af30be530b6afc94af8f (diff)
downloadjgit-ff7149fb95d11e26e3409903a19cfde7df3ff90e.tar.gz
jgit-ff7149fb95d11e26e3409903a19cfde7df3ff90e.zip
Require the hamcrest packaging that comes with Eclipse
The other one gets installed with SWTBot, but you do not need it if you do not hack EGit. Using import-package instead of require-bundle fixes the dependency. Actually we do not need hamcrest at this time, but JUnit wants it. Change-Id: I59873618f86d02e8439d40c1f322ea8e5c4fe3fc Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
-rw-r--r--org.eclipse.jgit.http.test/META-INF/MANIFEST.MF4
-rw-r--r--org.eclipse.jgit.test/META-INF/MANIFEST.MF7
2 files changed, 6 insertions, 5 deletions
diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index ff4464e6c0..1782310c70 100644
--- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
@@ -34,5 +34,5 @@ Import-Package: javax.servlet;version="[2.5.0,3.0.0)",
org.eclipse.jgit.transport;version="[0.11.0,0.12.0)",
org.eclipse.jgit.util;version="[0.11.0,0.12.0)",
org.eclipse.jgit.junit.http;version="[0.11.0,0.12.0)",
- org.junit;version="[4.0.0,5.0.0)"
-Require-Bundle: org.hamcrest;bundle-version="[1.1.0,2.0.0)"
+ org.junit;version="[4.0.0,5.0.0)",
+ org.hamcrest.core;version="[1.1.0,2.0.0)"
diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index 91f8411911..eeb260b83c 100644
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -37,6 +37,7 @@ Import-Package: org.eclipse.jgit;version="[0.11.0,0.12.0)",
org.eclipse.jgit.treewalk.filter;version="[0.11.0,0.12.0)",
org.eclipse.jgit.util;version="[0.11.0,0.12.0)",
org.eclipse.jgit.util.io;version="[0.11.0,0.12.0)",
- org.junit;version="[4.0.0,5.0.0)"
-Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)",
- org.hamcrest;bundle-version="[1.1.0,2.0.0)"
+ org.junit;version="[4.0.0,5.0.0)",
+ org.hamcrest.core;version="[1.1.0,2.0.0)"
+Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)"
+