Adjusted tests since OSGi now requires JavaSE-1.6
diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ScriptGenerationTests.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ScriptGenerationTests.java
index 85eaeac..a42cfb9 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ScriptGenerationTests.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ScriptGenerationTests.java
@@ -965,6 +965,7 @@
generateScripts(buildFolder, buildProperties);
}
+ // NOTE: If this test fails, then the supported BREE probably increased and need to be adjusted below
public void testBug239843_2() throws Exception {
IFolder buildFolder = newTest("239843_2");
@@ -976,7 +977,7 @@
buffer.append("org.osgi.framework.system.packages=org.my.package\n");
buffer.append("org.osgi.framework.bootdelegation = org.my.package\n");
// A minimum EE of 1.5 is needed for the OSGi state to resolve (bug 392789)
- buffer.append("org.osgi.framework.executionenvironment=MyCustomProfile,OSGi/Minimum-1.0,OSGi/Minimum-1.1,OSGi/Minimum-1.2,JRE-1.1,J2SE-1.2,J2SE-1.3,J2SE-1.4, J2SE-1.5\n");
+ buffer.append("org.osgi.framework.executionenvironment=MyCustomProfile,OSGi/Minimum-1.0,OSGi/Minimum-1.1,OSGi/Minimum-1.2,JRE-1.1,J2SE-1.2,J2SE-1.3,J2SE-1.4,J2SE-1.5,JavaSE-1.6\n");
buffer.append("org.osgi.framework.system.capabilities=osgi.ee; osgi.ee=\"OSGi/Minimum\"; version:List<Version>=\"1.0, 1.1, 1.2\", osgi.ee; osgi.ee=\"JRE\"; version:List<Version>=\"1.0, 1.1\", osgi.ee; osgi.ee=\"JavaSE\"; version:List<Version>=\"1.0, 1.1, 1.2, 1.3, 1.4, 1.5\"\n");
Utils.writeBuffer(custom.getFile("my.profile"), buffer);
@@ -993,6 +994,7 @@
generateScripts(buildFolder, buildProperties);
}
+ // NOTE: If this test fails, it might be because the supported BREE probably increased and need to be adjusted below
public void testBug239843_3() throws Exception {
IFolder buildFolder = newTest("239843_3");
@@ -1004,8 +1006,8 @@
buffer.append("org.osgi.framework.system.packages=org.my.package\n");
buffer.append("org.osgi.framework.bootdelegation = org.my.package\n");
// A minimum EE of 1.5 is needed for the OSGi state to resolve (bug 392789)
- buffer.append("org.osgi.framework.executionenvironment=MyCustomProfile,OSGi/Minimum-1.0,OSGi/Minimum-1.1,OSGi/Minimum-1.2,JRE-1.1,J2SE-1.2,J2SE-1.3,J2SE-1.4, J2SE-1.5\n");
- buffer.append("org.osgi.framework.system.capabilities=osgi.ee; osgi.ee=\"OSGi/Minimum\"; version:List<Version>=\"1.0, 1.1, 1.2\", osgi.ee; osgi.ee=\"JRE\"; version:List<Version>=\"1.0, 1.1\", osgi.ee; osgi.ee=\"JavaSE\"; version:List<Version>=\"1.0, 1.1, 1.2, 1.3, 1.4, 1.5\"\n");
+ buffer.append("org.osgi.framework.executionenvironment=MyCustomProfile,OSGi/Minimum-1.0,OSGi/Minimum-1.1,OSGi/Minimum-1.2,JRE-1.1,J2SE-1.2,J2SE-1.3,J2SE-1.4, J2SE-1.5, JavaSE-1.6\n");
+ buffer.append("org.osgi.framework.system.capabilities=osgi.ee; osgi.ee=\"OSGi/Minimum\"; version:List<Version>=\"1.0, 1.1, 1.2\", osgi.ee; osgi.ee=\"JRE\"; version:List<Version>=\"1.0, 1.1\", osgi.ee; osgi.ee=\"JavaSE\"; version:List<Version>=\"1.0, 1.1, 1.2, 1.3, 1.4, 1.5,1.6\"\n");
Utils.writeBuffer(custom.getFile("my.profile"), buffer);
Utils.writeBuffer(custom.getFile("profiles/my.profile"), buffer);
