[518382] JavaEEProjectUtilities.getLatestVersion() needs to be updated
for Java EE 8
diff --git a/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF
index 9238db3..64e0928 100644
--- a/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.jst.j2ee.core; singleton:=true
-Bundle-Version: 1.3.200.qualifier
+Bundle-Version: 1.3.300.qualifier
Bundle-Activator: org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionConstants.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionConstants.java
index edb0b76..b307c93 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionConstants.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionConstants.java
@@ -34,6 +34,7 @@
public int JEE_5_0_ID = 50;
public int JEE_6_0_ID = 60;
public int JEE_7_0_ID = 70;
+ public int JEE_8_0_ID = 80;
public int EJB_1_0_ID = 10;
public int EJB_1_1_ID = 11;
public int EJB_2_0_ID = 20;
@@ -47,8 +48,10 @@
public int WEB_2_5_ID = 25;
public int WEB_3_0_ID = 30;
public int WEB_3_1_ID = 31;
+ public int WEB_4_0_ID = 40;
public int WEBFRAGMENT_3_0_ID = 30;
public int WEBFRAGMENT_3_1_ID = 31;
+ public int WEBFRAGMENT_4_0_ID = 40;
public int TAGLIB_1_1_ID = 11;
public int TAGLIB_1_2_ID = 12;
public int TAGLIB_2_0_ID = 20;
@@ -61,6 +64,7 @@
public int SERVLET_2_5 = 25;
public int SERVLET_3_0 = 30;
public int SERVLET_3_1 = 31;
+ public int SERVLET_4_0 = 40;
public int JCA_1_0_ID = 10;
public int JCA_1_5_ID = 15;
public int JCA_1_6_ID = 16;
@@ -88,12 +92,14 @@
public int VERSION_2_3 = 23;
public int VERSION_2_4 = 24;
public int VERSION_2_5 = 25;
- public int VERSION_3_0 = 30;
+ public int VERSION_3_0 = 30;
+ public int VERSION_4_0 = 40;
public int VERSION_3_1 = 31;
public int VERSION_3_2 = 32;
public int VERSION_5_0 = 50;
public int VERSION_6_0 = 60;
public int VERSION_7_0 = 70;
+ public int VERSION_8_0 = 80;
public String VERSION_1_0_TEXT = "1.0"; //$NON-NLS-1$
public String VERSION_1_1_TEXT = "1.1"; //$NON-NLS-1$
@@ -112,9 +118,11 @@
public String VERSION_3_0_TEXT = "3.0"; //$NON-NLS-1$
public String VERSION_3_1_TEXT = "3.1"; //$NON-NLS-1$
public String VERSION_3_2_TEXT = "3.2"; //$NON-NLS-1$
+ public String VERSION_4_0_TEXT = "4.0"; //$NON-NLS-1$
public String VERSION_5_0_TEXT = "5.0"; //$NON-NLS-1$
public String VERSION_6_0_TEXT = "6.0"; //$NON-NLS-1$
public String VERSION_7_0_TEXT = "7.0"; //$NON-NLS-1$
+ public String VERSION_8_0_TEXT = "8.0"; //$NON-NLS-1$
public String VERSION_5_TEXT = "5"; //$NON-NLS-1$
public String VERSION_6_TEXT = "6"; //$NON-NLS-1$
public String VERSION_7_TEXT = "7"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.jst.j2ee.core/pom.xml b/plugins/org.eclipse.jst.j2ee.core/pom.xml
index fb42f3f..ee9b37d 100644
--- a/plugins/org.eclipse.jst.j2ee.core/pom.xml
+++ b/plugins/org.eclipse.jst.j2ee.core/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.javaee</groupId>
<artifactId>org.eclipse.jst.j2ee.core</artifactId>
- <version>1.3.200-SNAPSHOT</version>
+ <version>1.3.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
index 3164df3..9a0d499 100644
--- a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.jst.j2ee; singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.100.qualifier
Bundle-Activator: org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/JavaEEProjectUtilities.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/JavaEEProjectUtilities.java
index 5b3e894..271f415 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/JavaEEProjectUtilities.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/JavaEEProjectUtilities.java
@@ -465,13 +465,13 @@
private static int getLatestVersion(IProject project) {
if (isEARProject(project) || isApplicationClientProject(project))
- return J2EEVersionConstants.VERSION_7_0;
+ return J2EEVersionConstants.VERSION_8_0;
if (isEJBProject(project))
return J2EEVersionConstants.VERSION_3_2;
if (isDynamicWebProject(project))
- return J2EEVersionConstants.VERSION_3_1;
+ return J2EEVersionConstants.VERSION_4_0;
if (isWebFragmentProject(project))
- return J2EEVersionConstants.VERSION_3_1;
+ return J2EEVersionConstants.VERSION_4_0;
if (isJCAProject(project))
return J2EEVersionConstants.VERSION_1_7;
return J2EEVersionConstants.UNKNOWN;
diff --git a/plugins/org.eclipse.jst.j2ee/pom.xml b/plugins/org.eclipse.jst.j2ee/pom.xml
index 395d31e..85918b3 100644
--- a/plugins/org.eclipse.jst.j2ee/pom.xml
+++ b/plugins/org.eclipse.jst.j2ee/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.javaee</groupId>
<artifactId>org.eclipse.jst.j2ee</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
