[546748] Add Java 12 facet to FacetUtil
Change-Id: Ibe26f3cd9b17879da5ba91dd1d5c333a1ce69e1f
diff --git a/core/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF b/core/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
index 29e404d..60e9b6a 100644
--- a/core/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
+++ b/core/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.jst.ws.consumption; singleton:=true
-Bundle-Version: 1.0.1200.qualifier
+Bundle-Version: 1.0.1300.qualifier
Bundle-ClassPath: .,
webserviceutils.jar
Bundle-Activator: org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin
diff --git a/core/bundles/org.eclipse.jst.ws.consumption/pom.xml b/core/bundles/org.eclipse.jst.ws.consumption/pom.xml
index f11fd06..af666d0 100644
--- a/core/bundles/org.eclipse.jst.ws.consumption/pom.xml
+++ b/core/bundles/org.eclipse.jst.ws.consumption/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.webservices</groupId>
<artifactId>org.eclipse.jst.ws.consumption</artifactId>
- <version>1.0.1200-SNAPSHOT</version>
+ <version>1.0.1300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/core/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java b/core/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java
index 5194cce..62a7498 100644
--- a/core/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java
+++ b/core/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2018 IBM Corporation and others.
+ * Copyright (c) 2007, 2019 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -1046,6 +1046,10 @@
{
javaFacetVersion = JavaFacet.VERSION_11;
}
+ else if (jdkComplianceLevel.equals("12"))
+ {
+ javaFacetVersion = JavaFacet.VERSION_12;
+ }
else
{
javaFacetVersion = javaFacet.getVersion("1.4");
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml
index 6755329..2bbb187 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.enterprise_ui.feature"
label="%featureName"
- version="3.9.300.qualifier"
+ version="3.9.400.qualifier"
provider-name="%providerName"
plugin="org.eclipse.jst.jee.ui"
license-feature="org.eclipse.license"
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml
index 185f9ae..4ad2ad2 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.eclipse.webtools.javaee</groupId>
<artifactId>org.eclipse.jst.enterprise_ui.feature</artifactId>
- <version>3.9.300-SNAPSHOT</version>
+ <version>3.9.400-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
