From ff7149fb95d11e26e3409903a19cfde7df3ff90e Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Sat, 1 Jan 2011 19:05:00 +0100 Subject: [PATCH] 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 --- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 7 ++++--- 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 ff4464e6c..1782310c7 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 91f841191..eeb260b83 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)" +