diff options
| author | Mickael Istria | 2014-08-19 10:38:37 +0000 |
|---|---|---|
| committer | Mickael Istria | 2014-08-19 17:07:10 +0000 |
| commit | 90b810df265e79befa5cf6aa97ec5bb891d50b26 (patch) | |
| tree | 5daf8c04ad24d17dd266922082e1f740ecf28f07 | |
| parent | 0f759b07c6429afc1f52aea8d8fb2a9dd22f7a92 (diff) | |
| download | eclipse.jdt.core-I20140819-2200.tar.gz eclipse.jdt.core-I20140819-2200.tar.xz eclipse.jdt.core-I20140819-2200.zip | |
Bug 441983 - Fix test dependency to both versions of o.e.jdt.annotationI20140819-2200I20140819-1800
This fixes tests with tycho-surefire-plugin
Change-Id: If5befdd7d0ecbd231cdaebe1378f76860501e7da
Also-by: Stephan Herrmann <stephan.herrmann@berlin.de>
Signed-off-by: Mickael Istria <mistria@redhat.com>
4 files changed, 10 insertions, 4 deletions
diff --git a/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF index b66127cdbe..480163ce34 100644 --- a/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF @@ -14,7 +14,9 @@ Require-Bundle: org.junit, org.eclipse.jdt.core.tests.compiler, org.eclipse.test.performance, org.eclipse.jdt.core, - org.eclipse.ui.ide + org.eclipse.ui.ide, + org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional, + org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/org.eclipse.jdt.core.tests.builder/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.builder/META-INF/MANIFEST.MF index 82881fbe7a..bcd550dcac 100644 --- a/org.eclipse.jdt.core.tests.builder/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.core.tests.builder/META-INF/MANIFEST.MF @@ -11,6 +11,8 @@ Require-Bundle: org.junit;bundle-version="3.8.1", org.eclipse.jdt.core.tests.compiler;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", - org.eclipse.test.performance;bundle-version="[3.1.0,4.0.0)" + org.eclipse.test.performance;bundle-version="[3.1.0,4.0.0)", + org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional, + org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional Bundle-RequiredExecutionEnvironment: J2SE-1.4 Eclipse-BundleShape: dir diff --git a/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF index 2dbe92c995..ccd500a691 100644 --- a/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF @@ -20,7 +20,8 @@ Require-Bundle: org.junit;bundle-version="3.8.1", org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.test.performance;bundle-version="[3.10.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", - org.eclipse.jdt.annotation;bundle-version="[1.1.0,3.0.0)" + org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional, + org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional Bundle-RequiredExecutionEnvironment: J2SE-1.4 Eclipse-BundleShape: dir Bundle-Activator: org.eclipse.jdt.core.tests.compiler.Activator diff --git a/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF index 1243557874..aa1074d147 100644 --- a/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF @@ -25,7 +25,8 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", org.eclipse.text;bundle-version="[3.2.0,4.0.0)", com.ibm.icu;bundle-version="3.4.4", org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)", - org.eclipse.jdt.annotation;bundle-version="[1.0.0,3.0.0)" + org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional, + org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional Bundle-RequiredExecutionEnvironment: J2SE-1.4 Eclipse-BundleShape: dir Bundle-Activator: org.eclipse.jdt.core.tests.Activator |