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
index 1269758575..15f36cddc3 100644
--- 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
@@ -1,417 +1,420 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/annotations/AnnotationTest.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/annotations/AnnotationTest.java
index 32fecb2c65..10ac262870 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/annotations/AnnotationTest.java
+++ b/apitools/org.eclipse.pde.api.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/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/compatibility/ProjectTypeContainerTests.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/compatibility/ProjectTypeContainerTests.java
index 51ef88628d..8399c4c998 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/compatibility/ProjectTypeContainerTests.java
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/compatibility/ProjectTypeContainerTests.java
@@ -164,7 +164,7 @@ protected Set 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/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/tags/TagTest.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/tags/TagTest.java
index d93a3e7aa8..cdfd85fcc1 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/tags/TagTest.java
+++ b/apitools/org.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/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/ClassFileScannerTests.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/ClassFileScannerTests.java
index 9f82fdb7e5..d7d4915bea 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/ClassFileScannerTests.java
+++ b/apitools/org.eclipse.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
index 64c5e31b7a..eca7bdba8f 100644
--- 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 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/.settings/org.eclipse.jdt.core.prefs
index e126488a9b..b33f61a460 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.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
index cd9a2f3dad..97bb4ef769 100644
--- 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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/post-split/a.b.c/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/post-split/a.b.c/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/post-split/a.b.c/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/post-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
index c6e1be1111..401448eb2f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/post-split/a.b.c/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/post-split/a.b.c/META-INF/MANIFEST.MF
index 51c33d8e5d..49f17f6d40 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/post-split/a.b.c/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.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
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c.core/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c.core/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c.core/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c.core/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
index 0e83ccad2f..a30184616a 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c.core/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c.core/META-INF/MANIFEST.MF
index f32fdf5527..382632e4ca 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c.core/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
index c6e1be1111..401448eb2f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c/META-INF/MANIFEST.MF
index 38f62b3018..1e9f16bc5f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test1/pre-split/a.b.c/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c.core/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c.core/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c.core/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c.core/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
index 0e83ccad2f..a30184616a 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c.core/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c.core/META-INF/MANIFEST.MF
index a16f0978cd..fdc87be28f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c.core/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
index c6e1be1111..401448eb2f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c/META-INF/MANIFEST.MF
index de0bcedb89..a7d6d624f7 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/post-split/a.b.c/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/pre-split/a.b.c/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/pre-split/a.b.c/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/pre-split/a.b.c/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/pre-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
index c6e1be1111..401448eb2f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/pre-split/a.b.c/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/pre-split/a.b.c/META-INF/MANIFEST.MF
index ff0235f2d0..c94afb2a7e 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test10/pre-split/a.b.c/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c.core/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c.core/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c.core/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c.core/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
index 0e83ccad2f..a30184616a 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c.core/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c.core/META-INF/MANIFEST.MF
index f32fdf5527..382632e4ca 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c.core/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
index c6e1be1111..401448eb2f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c/META-INF/MANIFEST.MF
index 38f62b3018..1e9f16bc5f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/post-split/a.b.c/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/pre-split/a.b.c/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/pre-split/a.b.c/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/pre-split/a.b.c/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/pre-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
index c6e1be1111..401448eb2f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/pre-split/a.b.c/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/pre-split/a.b.c/META-INF/MANIFEST.MF
index 51c33d8e5d..49f17f6d40 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test2/pre-split/a.b.c/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.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
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c.core/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c.core/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c.core/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c.core/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
index 0e83ccad2f..a30184616a 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c.core/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c.core/META-INF/MANIFEST.MF
index f32fdf5527..382632e4ca 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c.core/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
index c6e1be1111..401448eb2f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c/META-INF/MANIFEST.MF
index 38f62b3018..1e9f16bc5f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/post-split/a.b.c/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/pre-split/a.b.c/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/pre-split/a.b.c/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/pre-split/a.b.c/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/pre-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
index c6e1be1111..401448eb2f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/pre-split/a.b.c/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/pre-split/a.b.c/META-INF/MANIFEST.MF
index 51c33d8e5d..49f17f6d40 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/pre-split/a.b.c/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test3/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
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/post-split/a.b.c.core/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/post-split/a.b.c.core/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/post-split/a.b.c.core/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/post-split/a.b.c.core/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
index 0e83ccad2f..a30184616a 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/post-split/a.b.c.core/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/post-split/a.b.c.core/META-INF/MANIFEST.MF
index f32fdf5527..382632e4ca 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/post-split/a.b.c.core/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/post-split/a.b.c/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/post-split/a.b.c/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/post-split/a.b.c/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/post-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
index c6e1be1111..401448eb2f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/post-split/a.b.c/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/post-split/a.b.c/META-INF/MANIFEST.MF
index 38f62b3018..1e9f16bc5f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/post-split/a.b.c/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/pre-split/a.b.c/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/pre-split/a.b.c/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/pre-split/a.b.c/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/pre-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
index c6e1be1111..401448eb2f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/pre-split/a.b.c/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/pre-split/a.b.c/META-INF/MANIFEST.MF
index 51c33d8e5d..49f17f6d40 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/pre-split/a.b.c/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test4/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
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/post-split/a.b.c.core/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/post-split/a.b.c.core/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/post-split/a.b.c.core/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/post-split/a.b.c.core/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
index 0e83ccad2f..a30184616a 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/post-split/a.b.c.core/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/post-split/a.b.c.core/META-INF/MANIFEST.MF
index f32fdf5527..382632e4ca 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/post-split/a.b.c.core/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/post-split/a.b.c/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/post-split/a.b.c/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/post-split/a.b.c/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/post-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
index c6e1be1111..401448eb2f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/post-split/a.b.c/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/post-split/a.b.c/META-INF/MANIFEST.MF
index 38f62b3018..1e9f16bc5f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/post-split/a.b.c/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/pre-split/a.b.c/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/pre-split/a.b.c/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/pre-split/a.b.c/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/pre-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
index c6e1be1111..401448eb2f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/pre-split/a.b.c/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/pre-split/a.b.c/META-INF/MANIFEST.MF
index 51c33d8e5d..49f17f6d40 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/pre-split/a.b.c/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test5/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
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/post-split/a.b.c/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/post-split/a.b.c/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/post-split/a.b.c/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/post-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
index c6e1be1111..401448eb2f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/post-split/a.b.c/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/post-split/a.b.c/META-INF/MANIFEST.MF
index 51c33d8e5d..49f17f6d40 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/post-split/a.b.c/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/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
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/pre-split/a.b.c.core/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/pre-split/a.b.c.core/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/pre-split/a.b.c.core/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/pre-split/a.b.c.core/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/pre-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/pre-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
index 0e83ccad2f..a30184616a 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/pre-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/pre-split/a.b.c.core/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/pre-split/a.b.c.core/META-INF/MANIFEST.MF
index f32fdf5527..382632e4ca 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/pre-split/a.b.c.core/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/pre-split/a.b.c/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/pre-split/a.b.c/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/pre-split/a.b.c/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/pre-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
index c6e1be1111..401448eb2f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/pre-split/a.b.c/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/pre-split/a.b.c/META-INF/MANIFEST.MF
index 38f62b3018..1e9f16bc5f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/pre-split/a.b.c/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test6/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/post-split/a.b.c.core/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/post-split/a.b.c.core/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/post-split/a.b.c.core/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/post-split/a.b.c.core/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
index 0e83ccad2f..a30184616a 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/post-split/a.b.c.core/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/post-split/a.b.c.core/META-INF/MANIFEST.MF
index f32fdf5527..382632e4ca 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/post-split/a.b.c.core/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/post-split/a.b.c/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/post-split/a.b.c/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/post-split/a.b.c/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/post-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
index c6e1be1111..401448eb2f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/post-split/a.b.c/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/post-split/a.b.c/META-INF/MANIFEST.MF
index 659c437df2..cf937625fd 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/post-split/a.b.c/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/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.0.0";visibility:=reexport
Export-Package: a.b.c
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/pre-split/a.b.c/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/pre-split/a.b.c/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/pre-split/a.b.c/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/pre-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
index c6e1be1111..401448eb2f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/pre-split/a.b.c/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/pre-split/a.b.c/META-INF/MANIFEST.MF
index 51c33d8e5d..49f17f6d40 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/pre-split/a.b.c/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test7/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
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/post-split/a.b.c.core/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/post-split/a.b.c.core/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/post-split/a.b.c.core/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/post-split/a.b.c.core/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
index 0e83ccad2f..a30184616a 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/post-split/a.b.c.core/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/post-split/a.b.c.core/META-INF/MANIFEST.MF
index f32fdf5527..382632e4ca 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/post-split/a.b.c.core/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/post-split/a.b.c/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/post-split/a.b.c/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/post-split/a.b.c/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/post-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
index c6e1be1111..401448eb2f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/post-split/a.b.c/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/post-split/a.b.c/META-INF/MANIFEST.MF
index 38f62b3018..1e9f16bc5f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/post-split/a.b.c/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/pre-split/a.b.c/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/pre-split/a.b.c/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/pre-split/a.b.c/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/pre-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
index c6e1be1111..401448eb2f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/pre-split/a.b.c/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/pre-split/a.b.c/META-INF/MANIFEST.MF
index 51c33d8e5d..49f17f6d40 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/pre-split/a.b.c/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test8/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
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/post-split/a.b.c.core/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/post-split/a.b.c.core/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/post-split/a.b.c.core/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/post-split/a.b.c.core/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
index 0e83ccad2f..a30184616a 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/post-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/post-split/a.b.c.core/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/post-split/a.b.c.core/META-INF/MANIFEST.MF
index f32fdf5527..382632e4ca 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/post-split/a.b.c.core/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/post-split/a.b.c/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/post-split/a.b.c/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/post-split/a.b.c/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/post-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
index c6e1be1111..401448eb2f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/post-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/post-split/a.b.c/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/post-split/a.b.c/META-INF/MANIFEST.MF
index 38f62b3018..1e9f16bc5f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/post-split/a.b.c/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/pre-split/a.b.c.core/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/pre-split/a.b.c.core/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/pre-split/a.b.c.core/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/pre-split/a.b.c.core/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/pre-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/pre-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
index 0e83ccad2f..a30184616a 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/pre-split/a.b.c.core/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/pre-split/a.b.c.core/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/pre-split/a.b.c.core/META-INF/MANIFEST.MF
index f32fdf5527..382632e4ca 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/pre-split/a.b.c.core/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/pre-split/a.b.c/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/pre-split/a.b.c/.classpath
index 64c5e31b7a..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/pre-split/a.b.c/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/pre-split/a.b.c/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
index c6e1be1111..401448eb2f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/pre-split/a.b.c/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/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/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/pre-split/a.b.c/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/pre-split/a.b.c/META-INF/MANIFEST.MF
index 5b5a09e323..a1b2a364c6 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/pre-split/a.b.c/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/mergesplit/test9/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
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/tagproject/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/tagproject/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/tagproject/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/tagproject/.project b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/tagproject/.project
deleted file mode 100644
index c59eb2bfc3..0000000000
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/tagproject/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
- tagproject
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.pde.ManifestBuilder
-
-
-
-
- org.eclipse.pde.SchemaBuilder
-
-
-
-
- org.eclipse.pde.api.tools.apiAnalysisBuilder
-
-
-
-
-
- org.eclipse.pde.PluginNature
- org.eclipse.jdt.core.javanature
- org.eclipse.pde.api.tools.apiAnalysisNature
-
-
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/tagproject/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/tagproject/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7d76b63be9..0000000000
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/tagproject/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Thu Jul 16 11:12:55 CDT 2009
-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.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/tagproject/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/tagproject/META-INF/MANIFEST.MF
deleted file mode 100644
index 5e44e23c52..0000000000
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/tagproject/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Tagproject
-Bundle-SymbolicName: tagproject
-Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.pde.api.tools.annotations;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: a.b.c
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/tagproject/build.properties b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/tagproject/build.properties
deleted file mode 100644
index 9557b00393..0000000000
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/tagproject/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2011 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/tagproject/src/a/b/c/Dummy.txt b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/tagproject/src/a/b/c/Dummy.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/refprojectjava7/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/refprojectjava7/.classpath
index 098194ca4b..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/refprojectjava7/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/refprojectjava7/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/refprojectjava7/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/refprojectjava7/.settings/org.eclipse.jdt.core.prefs
index 7341ab1683..3a21537071 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/refprojectjava7/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/refprojectjava7/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,11 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/refprojectjava7/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/refprojectjava7/META-INF/MANIFEST.MF
index 70e8a70476..8b972c6882 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/refprojectjava7/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/refprojectjava7/META-INF/MANIFEST.MF
@@ -10,6 +10,6 @@ Export-Package: a,
i,
m,
pack.multi.part
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.pde.api.tools;bundle-version="1.0.600",
org.eclipse.pde.api.tools.annotations;bundle-version="1.0.0"
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/usageprojectjava7/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/usageprojectjava7/.classpath
index 098194ca4b..eca7bdba8f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/usageprojectjava7/.classpath
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/usageprojectjava7/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/usageprojectjava7/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/usageprojectjava7/.settings/org.eclipse.jdt.core.prefs
index 47f94b76c5..b0269ce334 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/usageprojectjava7/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/usageprojectjava7/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
#Wed Sep 10 10:52:35 CDT 2008
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/usageprojectjava7/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/usageprojectjava7/META-INF/MANIFEST.MF
index 03c3f71365..82d29239ea 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/usageprojectjava7/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/usageprojectjava7/META-INF/MANIFEST.MF
@@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: usageprojectjava7
Bundle-SymbolicName: usageprojectjava7
Bundle-Version: 1.0.0
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: refprojectjava7,
org.eclipse.pde.api.tools.annotations;bundle-version="1.0.0"