Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Collier2018-08-16 13:34:32 -0400
committerJohn Collier2018-08-16 13:34:32 -0400
commit540338772af707ea2ae02d7a09771a8a31c53322 (patch)
treedb80ee7a3d8aca2e5fe86e307b1e6255ff33ddd4
parent377f28f7a9412a007a0baab6e0bbf484f5eeba2b (diff)
downloadwebtools.common-540338772af707ea2ae02d7a09771a8a31c53322.tar.gz
webtools.common-540338772af707ea2ae02d7a09771a8a31c53322.tar.xz
webtools.common-540338772af707ea2ae02d7a09771a8a31c53322.zip
Add Java 11 support to WTP
Adds support for Java 11 by adding the Java 11 facet to org.eclipse.jst.common.project.facet.core. Signed-off-by: John Collier <John.J.Collier@ibm.com>
-rw-r--r--features/org.eclipse.jst.common.fproj.enablement.jdt.feature/feature.xml2
-rw-r--r--features/org.eclipse.jst.common.fproj.enablement.jdt.feature/pom.xml2
-rw-r--r--plugins/org.eclipse.jst.common.project.facet.core/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.jst.common.project.facet.core/plugin.xml8
-rw-r--r--plugins/org.eclipse.jst.common.project.facet.core/pom.xml2
-rw-r--r--plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/JavaFacet.java3
-rw-r--r--plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/StandardJreRuntimeComponent.java9
-rw-r--r--plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/internal/JavaFacetUtil.java3
8 files changed, 23 insertions, 8 deletions
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 841c9fc3b..0dca4ef62 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.10.0.qualifier"
+ version="3.11.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 2dc142949..edb351d85 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.10.0-SNAPSHOT</version>
+ <version>3.11.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 f5e2b6072..3c9acbfaa 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-ManifestVersion: 2
Bundle-Vendor: %providerName
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.common.project.facet.core; singleton:=true
-Bundle-Version: 1.6.0.qualifier
+Bundle-Version: 1.7.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 fbfbbd8a9..0b807100f 100644
--- a/plugins/org.eclipse.jst.common.project.facet.core/plugin.xml
+++ b/plugins/org.eclipse.jst.common.project.facet.core/plugin.xml
@@ -28,6 +28,7 @@
<runtime-component-version type="standard.jre" version="1.8"/>
<runtime-component-version type="standard.jre" version="9"/>
<runtime-component-version type="standard.jre" version="10"/>
+ <runtime-component-version type="standard.jre" version="11"/>
<supported>
<facet id="java" version="1.3"/>
@@ -68,6 +69,11 @@
<facet id="java" version="10"/>
<runtime-component id="standard.jre" version="[10"/>
</supported>
+
+ <supported>
+ <facet id="java" version="11"/>
+ <runtime-component id="standard.jre" version="[11"/>
+ </supported>
<adapter>
<runtime-component id="standard.jre"/>
@@ -100,6 +106,8 @@
<project-facet-version facet="java" version="9"/>
<project-facet-version facet="java" version="10"/>
+
+ <project-facet-version facet="java" version="11"/>
<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 9cb4838bd..bb20c3cb5 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.6.0-SNAPSHOT</version>
+ <version>1.7.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 c0e4a6baa..f47bc262f 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 support
+ * John Collier - Java 10 and 11 support
******************************************************************************/
package org.eclipse.jst.common.project.facet.core;
@@ -38,6 +38,7 @@ public final class JavaFacet
public static final IProjectFacetVersion VERSION_1_8 = FACET.getVersion( "1.8" ); //$NON-NLS-1$
public static final IProjectFacetVersion VERSION_9 = FACET.getVersion( "9" ); //$NON-NLS-1$
public static final IProjectFacetVersion VERSION_10 = FACET.getVersion( "10" ); //$NON-NLS-1$
+ public static final IProjectFacetVersion VERSION_11 = FACET.getVersion( "11" ); //$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 924e73c86..bce12e2a3 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
@@ -8,7 +8,7 @@
* Contributors:
* Konstantin Komissarchik - initial implementation and ongoing maintenance
* Carl Anderson - Java 9 support
- * John Collier - Java 10 support
+ * John Collier - Java 10 and 11 support
******************************************************************************/
package org.eclipse.jst.common.project.facet.core;
@@ -39,6 +39,7 @@ public final class StandardJreRuntimeComponent
public static final IRuntimeComponentVersion VERSION_1_8 = TYPE.getVersion( "1.8" ); //$NON-NLS-1$
public static final IRuntimeComponentVersion VERSION_9 = TYPE.getVersion( "9" ); //$NON-NLS-1$
public static final IRuntimeComponentVersion VERSION_10 = TYPE.getVersion( "10" ); //$NON-NLS-1$
+ public static final IRuntimeComponentVersion VERSION_11 = TYPE.getVersion( "11" ); //$NON-NLS-1$
@Deprecated
public static final IRuntimeComponentVersion VERSION_5_0 = VERSION_1_5;
@@ -97,9 +98,13 @@ public final class StandardJreRuntimeComponent
{
rcv = StandardJreRuntimeComponent.VERSION_10;
}
+ else if( jvmver.startsWith( "11" ) ) //$NON-NLS-1$
+ {
+ rcv = StandardJreRuntimeComponent.VERSION_11;
+ }
else
{
- rcv = StandardJreRuntimeComponent.VERSION_10;
+ rcv = StandardJreRuntimeComponent.VERSION_11;
}
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 7a3c7ba61..a20849438 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
@@ -8,7 +8,7 @@
* Contributors:
* Konstantin Komissarchik - initial implementation and ongoing maintenance
* Carl Anderson - Java 9 support
- * John Collier - Java 10 support
+ * John Collier - Java 10 and 11 support
******************************************************************************/
package org.eclipse.jst.common.project.facet.core.internal;
@@ -65,6 +65,7 @@ public final class JavaFacetUtil
FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_1_8, "JavaSE-1.8" ); //$NON-NLS-1$
FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_9, "JavaSE-9" ); //$NON-NLS-1$
FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_10, "JavaSE-10" ); //$NON-NLS-1$
+ FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_11, "JavaSE-11" ); //$NON-NLS-1$
}
public static String getCompilerLevel()

Back to the top