Bug 561306: Add Java 14 and 15 support
Adds the Java 14 and 15 facet to WTP common
Change-Id: Ice8a054005bf397a11375bee9732a0c65de3919a
Signed-off-by: John Collier <John.J.Collier@ibm.com>
diff --git a/features/org.eclipse.jst.common.fproj.enablement.jdt.feature/feature.xml b/features/org.eclipse.jst.common.fproj.enablement.jdt.feature/feature.xml
index 57c06d9..de85599 100644
--- a/features/org.eclipse.jst.common.fproj.enablement.jdt.feature/feature.xml
+++ b/features/org.eclipse.jst.common.fproj.enablement.jdt.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.common.fproj.enablement.jdt"
label="%featureName"
- version="3.12.0.qualifier"
+ version="3.13.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.jst.common.project.facet.core"
license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.jst.common.fproj.enablement.jdt.feature/pom.xml b/features/org.eclipse.jst.common.fproj.enablement.jdt.feature/pom.xml
index ac3d32b..91fb194 100644
--- a/features/org.eclipse.jst.common.fproj.enablement.jdt.feature/pom.xml
+++ b/features/org.eclipse.jst.common.fproj.enablement.jdt.feature/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.common</groupId>
<artifactId>org.eclipse.jst.common.fproj.enablement.jdt</artifactId>
- <version>3.12.0-SNAPSHOT</version>
+ <version>3.13.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/plugins/org.eclipse.jst.common.project.facet.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.project.facet.core/META-INF/MANIFEST.MF
index a3b2f63..5e77ba4 100644
--- a/plugins/org.eclipse.jst.common.project.facet.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.common.project.facet.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Vendor: %providerName
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.common.project.facet.core; singleton:=true
-Bundle-Version: 1.8.0.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-ClassPath: .
Bundle-Localization: plugin
Export-Package: org.eclipse.jst.common.project.facet.core,
diff --git a/plugins/org.eclipse.jst.common.project.facet.core/plugin.xml b/plugins/org.eclipse.jst.common.project.facet.core/plugin.xml
index 393b93f..6bd6449 100644
--- a/plugins/org.eclipse.jst.common.project.facet.core/plugin.xml
+++ b/plugins/org.eclipse.jst.common.project.facet.core/plugin.xml
@@ -31,6 +31,8 @@
<runtime-component-version type="standard.jre" version="11"/>
<runtime-component-version type="standard.jre" version="12"/>
<runtime-component-version type="standard.jre" version="13"/>
+ <runtime-component-version type="standard.jre" version="14"/>
+ <runtime-component-version type="standard.jre" version="15"/>
<supported>
<facet id="java" version="1.3"/>
@@ -86,6 +88,16 @@
<facet id="java" version="13"/>
<runtime-component id="standard.jre" version="[13"/>
</supported>
+
+ <supported>
+ <facet id="java" version="14"/>
+ <runtime-component id="standard.jre" version="[14"/>
+ </supported>
+
+ <supported>
+ <facet id="java" version="15"/>
+ <runtime-component id="standard.jre" version="[15"/>
+ </supported>
<adapter>
<runtime-component id="standard.jre"/>
@@ -124,6 +136,10 @@
<project-facet-version facet="java" version="12"/>
<project-facet-version facet="java" version="13"/>
+
+ <project-facet-version facet="java" version="14"/>
+
+ <project-facet-version facet="java" version="15"/>
<action facet="java" type="install" id="java.install">
<delegate class="org.eclipse.jst.common.project.facet.core.internal.JavaFacetInstallDelegate"/>
diff --git a/plugins/org.eclipse.jst.common.project.facet.core/pom.xml b/plugins/org.eclipse.jst.common.project.facet.core/pom.xml
index f89cdf9..bcbf422 100644
--- a/plugins/org.eclipse.jst.common.project.facet.core/pom.xml
+++ b/plugins/org.eclipse.jst.common.project.facet.core/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.common</groupId>
<artifactId>org.eclipse.jst.common.project.facet.core</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/JavaFacet.java b/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/JavaFacet.java
index 6bee006..a865077 100644
--- a/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/JavaFacet.java
+++ b/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/JavaFacet.java
@@ -8,7 +8,7 @@
* Contributors:
* Konstantin Komissarchik - initial implementation and ongoing maintenance
* Carl Anderson - Java 9 support
- * John Collier - Java 10-11, 13 support
+ * John Collier - Java 10-11, 13-15 support
* Leon Keuroglian - Java 12 support
******************************************************************************/
@@ -42,6 +42,8 @@
public static final IProjectFacetVersion VERSION_11 = FACET.getVersion( "11" ); //$NON-NLS-1$
public static final IProjectFacetVersion VERSION_12 = FACET.getVersion( "12" ); //$NON-NLS-1$
public static final IProjectFacetVersion VERSION_13 = FACET.getVersion( "13" ); //$NON-NLS-1$
+ public static final IProjectFacetVersion VERSION_14 = FACET.getVersion( "14" ); //$NON-NLS-1$
+ public static final IProjectFacetVersion VERSION_15 = FACET.getVersion( "15" ); //$NON-NLS-1$
@Deprecated
public static final IProjectFacetVersion JAVA_13 = VERSION_1_3;
diff --git a/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/StandardJreRuntimeComponent.java b/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/StandardJreRuntimeComponent.java
index dceabeb..d162e02 100644
--- a/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/StandardJreRuntimeComponent.java
+++ b/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/StandardJreRuntimeComponent.java
@@ -43,6 +43,8 @@
public static final IRuntimeComponentVersion VERSION_11 = TYPE.getVersion( "11" ); //$NON-NLS-1$
public static final IRuntimeComponentVersion VERSION_12 = TYPE.getVersion( "12" ); //$NON-NLS-1$
public static final IRuntimeComponentVersion VERSION_13 = TYPE.getVersion( "13" ); //$NON-NLS-1$
+ public static final IRuntimeComponentVersion VERSION_14 = TYPE.getVersion( "14" ); //$NON-NLS-1$
+ public static final IRuntimeComponentVersion VERSION_15 = TYPE.getVersion( "15" ); //$NON-NLS-1$
@Deprecated
public static final IRuntimeComponentVersion VERSION_5_0 = VERSION_1_5;
@@ -113,9 +115,17 @@
{
rcv = StandardJreRuntimeComponent.VERSION_13;
}
+ else if( jvmver.startsWith( "14" ) ) //$NON-NLS-1$
+ {
+ rcv = StandardJreRuntimeComponent.VERSION_14;
+ }
+ else if( jvmver.startsWith( "15" ) ) //$NON-NLS-1$
+ {
+ rcv = StandardJreRuntimeComponent.VERSION_15;
+ }
else
{
- rcv = StandardJreRuntimeComponent.VERSION_13;
+ rcv = StandardJreRuntimeComponent.VERSION_15;
}
final Map<String,String> properties = new HashMap<String,String>();
diff --git a/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/internal/JavaFacetUtil.java b/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/internal/JavaFacetUtil.java
index 1cb2aa0..b2ebbf8 100644
--- a/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/internal/JavaFacetUtil.java
+++ b/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/internal/JavaFacetUtil.java
@@ -69,6 +69,8 @@
FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_11, "JavaSE-11" ); //$NON-NLS-1$
FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_12, "JavaSE-12" ); //$NON-NLS-1$
FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_13, "JavaSE-13" ); //$NON-NLS-1$
+ FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_14, "JavaSE-14" ); //$NON-NLS-1$
+ FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_15, "JavaSE-15" ); //$NON-NLS-1$
}
public static String getCompilerLevel()
