summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Oberlies2011-10-13 07:43:19 (EDT)
committerTobias Oberlies2011-10-25 09:55:33 (EDT)
commit4f57e452bf00223696f3fd13b5d6fcef6d2e9a7b (patch)
tree2a2475d2f1fef1ce21221eecba44fe05501fabfe
parent731f393d15896534bb3fe264129641304c36b7f1 (diff)
downloadrt.equinox.p2-4f57e452bf00223696f3fd13b5d6fcef6d2e9a7b.zip
rt.equinox.p2-4f57e452bf00223696f3fd13b5d6fcef6d2e9a7b.tar.gz
rt.equinox.p2-4f57e452bf00223696f3fd13b5d6fcef6d2e9a7b.tar.bz2
360797 Allow use of junit4 in org.eclipse.equinox.p2.testsv20111025-1355
- Increase class file compatibility level of test bundle to 1.5 to preserve @Test annotations.
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/.settings/org.eclipse.jdt.core.prefs4
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/build.properties2
3 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.p2.tests/.settings/org.eclipse.jdt.core.prefs
index 47ca556..c2a3d1f 100644
--- a/bundles/org.eclipse.equinox.p2.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.equinox.p2.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Mon Dec 28 06:14:12 CET 2009
+#Thu Oct 13 13:30:29 CEST 2011
eclipse.preferences.version=1
instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
@@ -10,7 +10,7 @@ org.eclipse.jdt.core.circularClasspath=error
org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=jsr14
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
diff --git a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF
index e343c40..18bb1d3 100644
--- a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF
@@ -28,7 +28,7 @@ Require-Bundle: org.eclipse.equinox.frameworkadmin,
org.eclipse.equinox.p2.publisher;bundle-version="1.0.0",
org.easymock;bundle-version="2.4.0",
org.eclipse.equinox.frameworkadmin.test;bundle-version="1.0.0",
- org.junit;bundle-version="3.8.0",
+ org.junit;bundle-version="4.8.0",
org.eclipse.equinox.p2.installer;bundle-version="[1.0.0,2.0.0)",
org.eclipse.equinox.simpleconfigurator;bundle-version="1.0.100",
org.eclipse.equinox.p2.updatechecker;bundle-version="1.0.0",
diff --git a/bundles/org.eclipse.equinox.p2.tests/build.properties b/bundles/org.eclipse.equinox.p2.tests/build.properties
index ab74e38..5ab8fbb 100644
--- a/bundles/org.eclipse.equinox.p2.tests/build.properties
+++ b/bundles/org.eclipse.equinox.p2.tests/build.properties
@@ -20,5 +20,5 @@ bin.includes = META-INF/,\
customCallBack=foo.xml
src.includes = about.html
javacWarnings..=-raw,-unchecked,-varargsCast
-javacTarget=jsr14
+javacTarget=1.5
javacSource=1.5