[580620] Add a Java 19 project facet version
Change-Id: Ifda0b103dab057025d8a46906f7a80d7a889c8c8
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 2f6547a..b2f07c7 100644
--- a/plugins/org.eclipse.jst.common.project.facet.core/plugin.xml
+++ b/plugins/org.eclipse.jst.common.project.facet.core/plugin.xml
@@ -36,6 +36,7 @@
<runtime-component-version type="standard.jre" version="16"/>
<runtime-component-version type="standard.jre" version="17"/>
<runtime-component-version type="standard.jre" version="18"/>
+ <runtime-component-version type="standard.jre" version="19"/>
<supported>
<facet id="java" version="1.3"/>
@@ -117,6 +118,11 @@
<runtime-component id="standard.jre" version="[18"/>
</supported>
+ <supported>
+ <facet id="java" version="19"/>
+ <runtime-component id="standard.jre" version="[19"/>
+ </supported>
+
<adapter>
<runtime-component id="standard.jre"/>
<factory class="org.eclipse.jst.common.project.facet.core.internal.StandardJreClasspathProvider$Factory"/>
@@ -165,6 +171,8 @@
<project-facet-version facet="java" version="18"/>
+ <project-facet-version facet="java" version="19"/>
+
<action facet="java" type="install" id="java.install">
<delegate class="org.eclipse.jst.common.project.facet.core.internal.JavaFacetInstallDelegate"/>
<config-factory class="org.eclipse.jst.common.project.facet.core.internal.JavaFacetInstallConfigFactory"/>
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 eff1689..58d80e2 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
@@ -1,5 +1,5 @@
/******************************************************************************
- * Copyright (c) 2010, 2021 Oracle and others
+ * Copyright (c) 2010, 2022 Oracle and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
@@ -48,6 +48,7 @@
public static final IProjectFacetVersion VERSION_16 = FACET.getVersion( "16" ); //$NON-NLS-1$
public static final IProjectFacetVersion VERSION_17 = FACET.getVersion( "17" ); //$NON-NLS-1$
public static final IProjectFacetVersion VERSION_18 = FACET.getVersion( "18" ); //$NON-NLS-1$
+ public static final IProjectFacetVersion VERSION_19 = FACET.getVersion( "19" ); //$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 178b3a9..b129899 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
@@ -1,5 +1,5 @@
/******************************************************************************
- * Copyright (c) 2010, 2021 Oracle and others
+ * Copyright (c) 2010, 2022 Oracle and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
@@ -49,6 +49,7 @@
public static final IRuntimeComponentVersion VERSION_16 = TYPE.getVersion( "16" ); //$NON-NLS-1$
public static final IRuntimeComponentVersion VERSION_17 = TYPE.getVersion( "17" ); //$NON-NLS-1$
public static final IRuntimeComponentVersion VERSION_18 = TYPE.getVersion( "18" ); //$NON-NLS-1$
+ public static final IRuntimeComponentVersion VERSION_19 = TYPE.getVersion( "19" ); //$NON-NLS-1$
@Deprecated
public static final IRuntimeComponentVersion VERSION_5_0 = VERSION_1_5;
@@ -89,6 +90,10 @@
{
rcv = StandardJreRuntimeComponent.VERSION_1_8;
}
+ else if( jvmver.startsWith( "19" ) ) //$NON-NLS-1$
+ {
+ rcv = StandardJreRuntimeComponent.VERSION_19;
+ }
else if( jvmver.startsWith( "18" ) ) //$NON-NLS-1$
{
rcv = StandardJreRuntimeComponent.VERSION_18;
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 06c1750..b1007a5 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
@@ -1,5 +1,5 @@
/******************************************************************************
- * Copyright (c) 2010, 2021 Oracle and others
+ * Copyright (c) 2010, 2022 Oracle and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
@@ -10,7 +10,7 @@
* Carl Anderson - Java 9 support
* John Collier - Java 10-11, 13-15 support
* Leon Keuroglian - Java 12 support
- * Nitin Dahyabhai - Java 12, 16, 17 support
+ * Nitin Dahyabhai - Java 12, 16, 17, 18, 19 support
******************************************************************************/
package org.eclipse.jst.common.project.facet.core.internal;
@@ -75,6 +75,7 @@
FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_16, "JavaSE-16" ); //$NON-NLS-1$
FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_17, "JavaSE-17" ); //$NON-NLS-1$
FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_18, "JavaSE-18" ); //$NON-NLS-1$
+ FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_19, "JavaSE-19" ); //$NON-NLS-1$
}
public static String getCompilerLevel()
