Bug 545051 - Common place in PDE to designate "latest supported" JDK 9+
version
Change-Id: Id186de2f5272ae2ab2db9cbcabb99657d79f2add
Signed-off-by: Vikas Chandra <Vikas.Chandra@in.ibm.com>
diff --git a/org.eclipse.pde.build/META-INF/MANIFEST.MF b/org.eclipse.pde.build/META-INF/MANIFEST.MF
index a86fe0b..8b079f2 100644
--- a/org.eclipse.pde.build/META-INF/MANIFEST.MF
+++ b/org.eclipse.pde.build/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.pde.build;singleton:=true
-Bundle-Version: 3.10.400.qualifier
+Bundle-Version: 3.10.500.qualifier
Bundle-ClassPath: pdebuild.jar
Bundle-Activator: org.eclipse.pde.internal.build.BuildActivator
Bundle-Vendor: %providerName
diff --git a/org.eclipse.pde.build/pom.xml b/org.eclipse.pde.build/pom.xml
index 7ace954..4459793 100644
--- a/org.eclipse.pde.build/pom.xml
+++ b/org.eclipse.pde.build/pom.xml
@@ -18,6 +18,6 @@
</parent>
<groupId>org.eclipse.pde</groupId>
<artifactId>org.eclipse.pde.build</artifactId>
- <version>3.10.400-SNAPSHOT</version>
+ <version>3.10.500-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java
index d13df63..9ee1a8b 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java
@@ -31,7 +31,7 @@
// This class provides a higher level API on the state
public class PDEState implements IPDEBuildConstants, IBuildPropertiesConstants {
private static final String[] MANIFEST_ENTRIES = {Constants.BUNDLE_LOCALIZATION, Constants.BUNDLE_NAME, Constants.BUNDLE_VENDOR, ECLIPSE_BUNDLE_SHAPE, ECLIPSE_SOURCE_BUNDLE, ECLIPSE_SOURCE_REF};
-
+ private static int LAST_SUPPORTED_JDK = 12;
private StateObjectFactory factory;
protected State state;
private long id;
@@ -432,12 +432,14 @@
}
}
}
- // from java 10 and beyond
- String[] java10AndBeyond = {"JavaSE-10", "JavaSE-11", "JavaSE-12"}; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+ // from java 10 and beyond
+ ArrayList<String> eeJava10AndBeyond = new ArrayList<>();
+ for (int i = 10; i <= LAST_SUPPORTED_JDK; i++) {
+ eeJava10AndBeyond.add("JavaSE-" + i);//$NON-NLS-1$
+ }
prop = new Hashtable<>();
String previousEE = eeJava9;
- for (int i = 0; i <= java10AndBeyond.length - 1; i++) {
- String execEnvID = java10AndBeyond[i];
+ for (String execEnvID : eeJava10AndBeyond) {
prop = new Hashtable<>();
Properties javaProfilePropertiesForVMPackage = getJavaProfilePropertiesForVMPackage(execEnvID);
if (javaProfilePropertiesForVMPackage != null) {
