Move API-Tools test resources to JavaSE-1.8

ECJ does not support Java versions below 1.8 anymore Contributes to fixing eclipse-platform/eclipse.platform.releng.aggregator#2197
fedejeanne · Jul 31, 2024 · 7ec4d63 · 7ec4d63
1 parent 6df7c66
commit 7ec4d63
Show file tree

Hide file tree

Showing 113 changed files with 592 additions and 664 deletions.
diff --git a/apitools/org.eclipse.pde.api.tools.tests/API Tools Plugin Test Suite.launch b/apitools/org.eclipse.pde.api.tools.tests/API Tools Plugin Test Suite.launch
diff --git a/...i.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/annotations/AnnotationTest.java b/...i.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/annotations/AnnotationTest.java
@@ -178,7 +178,7 @@ protected IPath getTestSourcePath() {
 
 	@Override
 	protected String getTestingProjectName() {
-		return "tagproject"; //$NON-NLS-1$
+		return "java8tags"; //$NON-NLS-1$
 	}
 
 	/**

diff --git a/.../src/org/eclipse/pde/api/tools/builder/tests/compatibility/ProjectTypeContainerTests.java b/.../src/org/eclipse/pde/api/tools/builder/tests/compatibility/ProjectTypeContainerTests.java
@@ -164,7 +164,7 @@ protected Set<String> collectAllTypeNames() throws CoreException {
 	public void testExecutionEnvironment() throws CoreException {
 		IApiTypeContainer bundleA = getTypeContainer("bundle.a"); //$NON-NLS-1$
 		assertArrayEquals("Unable to find BREE for bundle using 'Bundle-RequiredExecutionEvironment'", //$NON-NLS-1$
-				new String[] { "J2SE-1.5" }, bundleA.getApiComponent().getExecutionEnvironments()); //$NON-NLS-1$
+				new String[] { "JavaSE-1.8" }, bundleA.getApiComponent().getExecutionEnvironments()); //$NON-NLS-1$
 
 		IApiTypeContainer bundleB = getTypeContainer("bundle.b"); //$NON-NLS-1$
 		assertArrayEquals("Unable to find BREE for bundle using 'Require-Capability'", //$NON-NLS-1$

diff --git a/...eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/tags/TagTest.java b/...eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/tags/TagTest.java
@@ -170,7 +170,7 @@ protected IPath getTestSourcePath() {
 
 	@Override
 	protected String getTestingProjectName() {
-		return "tagproject"; //$NON-NLS-1$
+		return "java8tags"; //$NON-NLS-1$
 	}
 
 	/**

diff --git a/....pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/ClassFileScannerTests.java b/....pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/ClassFileScannerTests.java
@@ -55,8 +55,8 @@ protected boolean doCompile() {
 		String[] sourceFilePaths = new String[] { ROOT_PATH.toOSString() };
 		result &= TestSuiteHelper.compile(sourceFilePaths, WORKSPACE_ROOT.toOSString(), TestSuiteHelper.getCompilerOptions());
 		assertTrue("working directory should compile", result); //$NON-NLS-1$
-		result &= TestSuiteHelper.compile(ROOT_PATH.append("Test12.java").toOSString(), WORKSPACE_ROOT.toOSString(), new String[] {"-1.4", "-preserveAllLocals", "-nowarn" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		assertTrue("Test12 should compile to 1.4", result); //$NON-NLS-1$
+		result &= TestSuiteHelper.compile(ROOT_PATH.append("Test12.java").toOSString(), WORKSPACE_ROOT.toOSString(), new String[] {"-1.8", "-preserveAllLocals", "-nowarn" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		assertTrue("Test12 should compile to 1.8", result); //$NON-NLS-1$
 		return result;
 	}
 

diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/...e.pde.api.tools.tests/test-builder/baseline/bundle.a/.settings/org.eclipse.jdt.core.prefs b/...e.pde.api.tools.tests/test-builder/baseline/bundle.a/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 #Wed Aug 13 13:59:24 CDT 2008
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: API Tools Tests Plug-in A
 Bundle-SymbolicName: bundle.a
 Bundle-Version: 1.0.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: a.annotations,
  a.bundles,
  a.classes.constructors,

diff --git a/...org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/post-split/a.b.c/.classpath b/...org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/post-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/...tests/test-builder/mergesplit/test1/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/...tests/test-builder/mergesplit/test1/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 #Fri Dec 12 15:24:28 CST 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/...e.pde.api.tools.tests/test-builder/mergesplit/test1/post-split/a.b.c/META-INF/MANIFEST.MF b/...e.pde.api.tools.tests/test-builder/mergesplit/test1/post-split/a.b.c/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Test Plug-in
 Bundle-SymbolicName: a.b.c;singleton:=true
 Bundle-Version: 1.0.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: a.b.c,
  d.e.f
diff --git a/...eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c.core/.classpath b/...eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/...s/test-builder/mergesplit/test1/pre-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs b/...s/test-builder/mergesplit/test1/pre-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 #Fri Dec 12 15:34:46 CST 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/...e.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c.core/META-INF/MANIFEST.MF b/...e.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c.core/META-INF/MANIFEST.MF
@@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Core Plug-in
 Bundle-SymbolicName: a.b.c.core
 Bundle-Version: 1.0.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: a.b.c,
  d.e.f
diff --git a/.../org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c/.classpath b/.../org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/....tests/test-builder/mergesplit/test1/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/....tests/test-builder/mergesplit/test1/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 #Fri Dec 12 15:24:28 CST 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/...se.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c/META-INF/MANIFEST.MF b/...se.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Test Plug-in
 Bundle-SymbolicName: a.b.c;singleton:=true
 Bundle-Version: 1.0.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Require-Bundle: a.b.c.core;bundle-version="1.0.0";visibility:=reexport
 Export-Package: a.b.c
diff --git a/...lipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c.core/.classpath b/...lipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/...test-builder/mergesplit/test10/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs b/...test-builder/mergesplit/test10/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 #Fri Dec 12 15:34:46 CST 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/...api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c.core/META-INF/MANIFEST.MF b/...api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c.core/META-INF/MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Core Plug-in
 Bundle-SymbolicName: a.b.c.core
 Bundle-Version: 1.1.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: a.b.c.core
diff --git a/...rg.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c/.classpath b/...rg.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/...ests/test-builder/mergesplit/test10/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/...ests/test-builder/mergesplit/test10/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 #Fri Dec 12 15:24:28 CST 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/....pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c/META-INF/MANIFEST.MF b/....pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Test Plug-in
 Bundle-SymbolicName: a.b.c;singleton:=true
 Bundle-Version: 1.1.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Require-Bundle: a.b.c.core;bundle-version="1.1.0";visibility:=reexport
 Export-Package: a.b.c,

diff --git a/...org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/pre-split/a.b.c/.classpath b/...org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/pre-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/...tests/test-builder/mergesplit/test10/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/...tests/test-builder/mergesplit/test10/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 #Fri Dec 12 15:24:28 CST 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/...e.pde.api.tools.tests/test-builder/mergesplit/test10/pre-split/a.b.c/META-INF/MANIFEST.MF b/...e.pde.api.tools.tests/test-builder/mergesplit/test10/pre-split/a.b.c/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Test Plug-in
 Bundle-SymbolicName: a.b.c;singleton:=true
 Bundle-Version: 1.0.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: a.b.c,
  d.e.f
diff --git a/...clipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c.core/.classpath b/...clipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/.../test-builder/mergesplit/test2/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs b/.../test-builder/mergesplit/test2/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 #Fri Dec 12 15:34:46 CST 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/....api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c.core/META-INF/MANIFEST.MF b/....api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c.core/META-INF/MANIFEST.MF
@@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Core Plug-in
 Bundle-SymbolicName: a.b.c.core
 Bundle-Version: 1.0.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: a.b.c,
  d.e.f
diff --git a/...org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c/.classpath b/...org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/...tests/test-builder/mergesplit/test2/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/...tests/test-builder/mergesplit/test2/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 #Fri Dec 12 15:24:28 CST 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/...e.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c/META-INF/MANIFEST.MF b/...e.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Test Plug-in
 Bundle-SymbolicName: a.b.c;singleton:=true
 Bundle-Version: 1.0.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Require-Bundle: a.b.c.core;bundle-version="1.0.0";visibility:=reexport
 Export-Package: a.b.c
diff --git a/.../org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/pre-split/a.b.c/.classpath b/.../org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/pre-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/....tests/test-builder/mergesplit/test2/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/....tests/test-builder/mergesplit/test2/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 #Fri Dec 12 15:24:28 CST 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/...se.pde.api.tools.tests/test-builder/mergesplit/test2/pre-split/a.b.c/META-INF/MANIFEST.MF b/...se.pde.api.tools.tests/test-builder/mergesplit/test2/pre-split/a.b.c/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Test Plug-in
 Bundle-SymbolicName: a.b.c;singleton:=true
 Bundle-Version: 1.0.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: a.b.c,
  d.e.f
diff --git a/...clipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c.core/.classpath b/...clipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/.../test-builder/mergesplit/test3/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs b/.../test-builder/mergesplit/test3/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 #Fri Dec 12 15:34:46 CST 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/....api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c.core/META-INF/MANIFEST.MF b/....api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c.core/META-INF/MANIFEST.MF
@@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Core Plug-in
 Bundle-SymbolicName: a.b.c.core
 Bundle-Version: 1.0.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: a.b.c,
  d.e.f
diff --git a/...org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c/.classpath b/...org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/...tests/test-builder/mergesplit/test3/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/...tests/test-builder/mergesplit/test3/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 #Fri Dec 12 15:24:28 CST 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/...e.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c/META-INF/MANIFEST.MF b/...e.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Test Plug-in
 Bundle-SymbolicName: a.b.c;singleton:=true
 Bundle-Version: 1.0.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Require-Bundle: a.b.c.core;bundle-version="1.0.0";visibility:=reexport
 Export-Package: a.b.c
diff --git a/.../org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/pre-split/a.b.c/.classpath b/.../org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/pre-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>