[530844] Add versions for Jakarta EE 9, stop preventing the user from changing versions

Signed-off-by: Nitin Dahyabhai <thatnitind@gmail.com>
Change-Id: I6e24cd3a248ac1a1d0ab95c5baf4dadfce717ee5
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 9c3b736..a2e8325 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.4.2.qualifier
+Bundle-Version: 1.4.3.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 9667307..bc30160 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2017 IBM Corporation and others.
+ * Copyright (c) 2001, 2021 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -35,6 +35,7 @@
 	public int JEE_6_0_ID = 60;
 	public int JEE_7_0_ID = 70;
 	public int JEE_8_0_ID = 80;
+	public int JEE_9_0_ID = 90;
 	public int EJB_1_0_ID = 10;	
 	public int EJB_1_1_ID = 11;	
 	public int EJB_2_0_ID = 20;	
@@ -65,6 +66,7 @@
 	public int SERVLET_3_0 = 30;
 	public int SERVLET_3_1 = 31;
 	public int SERVLET_4_0 = 40;
+	public int SERVLET_5_0 = 50;
 	public int JCA_1_0_ID = 10;
 	public int JCA_1_5_ID = 15;
 	public int JCA_1_6_ID = 16;
@@ -129,5 +131,6 @@
 	public String VERSION_6_TEXT        = "6";   //$NON-NLS-1$
 	public String VERSION_7_TEXT        = "7";   //$NON-NLS-1$
 	public String VERSION_8_TEXT        = "8";	//$NON-NLS-1$
+	public String VERSION_9_TEXT        = "9";	//$NON-NLS-1$
 					
 }
diff --git a/plugins/org.eclipse.jst.j2ee.core/pom.xml b/plugins/org.eclipse.jst.j2ee.core/pom.xml
index 78337da..1c13760 100644
--- a/plugins/org.eclipse.jst.j2ee.core/pom.xml
+++ b/plugins/org.eclipse.jst.j2ee.core/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.j2ee.core</artifactId>
-  <version>1.4.2-SNAPSHOT</version>
+  <version>1.4.3-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
index 1da97ab..a88aa2b 100644
--- a/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Web Plug-in
 Bundle-SymbolicName: org.eclipse.jst.j2ee.web; singleton:=true
-Bundle-Version: 1.1.911.qualifier
+Bundle-Version: 1.1.1000.qualifier
 Bundle-Activator: org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.j2ee.web/plugin.xml b/plugins/org.eclipse.jst.j2ee.web/plugin.xml
index 22217b1..93afc57 100644
--- a/plugins/org.eclipse.jst.j2ee.web/plugin.xml
+++ b/plugins/org.eclipse.jst.j2ee.web/plugin.xml
@@ -387,7 +387,7 @@
     <project-facet id="jst.web">
       <label>%WEB_FACET_LABEL</label>
       <description>%WEB_FACET_DESCRIPTION</description>
-      <default-version version="3.0"/>
+      <default-version version="4.0"/>
     </project-facet>
 
     <project-facet-version facet="jst.web" version="2.2">
@@ -460,19 +460,33 @@
       <group-member id="modules"/>
     </project-facet-version>
 
+    <project-facet-version facet="jst.web" version="5.0">
+      <constraint>
+        <and>
+          <requires facet="jst.java" version="[1.8"/>
+          <conflicts group="modules"/>
+        </and>
+      </constraint>
+      <group-member id="modules"/>
+    </project-facet-version>
+
     <action facet="jst.web" type="INSTALL" id="jst.web.install">
       <delegate class="org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDelegate"/>
       <config-factory class="org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider"/>
     </action>
 
+    <action facet="jst.web" type="version-change">
+      <delegate class="org.eclipse.jst.j2ee.web.project.facet.WebFacetVersionChangeDelegate"/>
+    </action>
+
     <event-handler facet="jst.web" type="RUNTIME_CHANGED">
        <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
     </event-handler>
     
-    <event-handler type="POST_INSTALL" facet="jst.web">
+    <event-handler facet="jst.web" type="POST_INSTALL">
       <delegate class="org.eclipse.jst.j2ee.web.project.facet.WebFacetPostInstallDelegate"/>
     </event-handler>
-    
+
     <template id="template.jst.web">
       <label>%WEB_FACET_TEMPLATE_LABEL</label>
       <fixed facet="jst.java"/>
diff --git a/plugins/org.eclipse.jst.j2ee.web/pom.xml b/plugins/org.eclipse.jst.j2ee.web/pom.xml
index 0c23a91..c5c925c 100644
--- a/plugins/org.eclipse.jst.j2ee.web/pom.xml
+++ b/plugins/org.eclipse.jst.j2ee.web/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.j2ee.web</artifactId>
-  <version>1.1.911-SNAPSHOT</version>
+  <version>1.1.1000-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebPlugin.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebPlugin.java
index 94b505a..fe55546 100644
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebPlugin.java
+++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebPlugin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
+ * Copyright (c) 2003, 2021 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -306,5 +306,8 @@
 	public static void logError(String message) {
 		Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, message));
 	}
+	public static void log(String message) {
+		Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.OK, message));
+	}
 
 }
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetVersionChangeDelegate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetVersionChangeDelegate.java
index 626ed1c..fb25be2 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetVersionChangeDelegate.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetVersionChangeDelegate.java
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
+ * Copyright (c) 2005, 2021 BEA Systems, Inc. and others
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,95 +14,26 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
 import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
 import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
 
 /**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
+ * Exists now to avoid preventing the user from changing the jst.web version
  */
 
-public final class WebFacetVersionChangeDelegate 
+public final class WebFacetVersionChangeDelegate implements IDelegate {
+	public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
+		// TODO: Trace this change to the project
+		monitor.beginTask("", 1); //$NON-NLS-1$
 
-    implements IDelegate
-    
-{
-    public void execute( final IProject project, 
-                         final IProjectFacetVersion fv,
-                         final Object cfg,
-                         final IProgressMonitor monitor )
-    
-        throws CoreException
-        
-    {
-        if( monitor != null )
-        {
-            monitor.beginTask( "", 1 ); //$NON-NLS-1$
-        }
-        
-        try
-        {
-            // Find the version that's currently installed.
-            
-            final IFacetedProject fproj
-                = ProjectFacetsManager.create( project );
-
-            final IProjectFacetVersion oldver
-                = fproj.getInstalledVersion( fv.getProjectFacet() );
-            
-            // Reset the classpath. 
-            
-            ClasspathHelper.removeClasspathEntries( project, oldver );
-            
-            if( ! ClasspathHelper.addClasspathEntries( project, fv ) )
-            {
-                // TODO: Support the no runtime case.
-                // ClasspathHelper.addClasspathEntries( project, fv, <something> );
-            }
-            
-            // Update the component version.
-            
-            
-//            final IVirtualComponent c = ComponentCore.createComponent(project);
-            
-//            final StructureEdit edit 
-//                = StructureEdit.getStructureEditForWrite( project );
-//            
-//            try
-//            {
-//                final ComponentType oldctype 
-//                    = StructureEdit.getComponentType( c );
-//                
-//                final ComponentType newctype 
-//                    = ComponentcoreFactory.eINSTANCE.createComponentType();
-//                
-//                newctype.setComponentTypeId( oldctype.getComponentTypeId() );
-//                newctype.setVersion( fv.getVersionString() );
-//                newctype.getProperties().addAll( oldctype.getProperties() );
-//                
-//                StructureEdit.setComponentType( c, newctype );
-//                
-//                edit.saveIfNecessary( null );
-//            }
-//            finally
-//            {
-//                edit.dispose();
-//            }
-            
-            if( monitor != null )
-            {
-                monitor.worked( 1 );
-            }
-        }
-        finally
-        {
-            if( monitor != null )
-            {
-                monitor.done();
-            }
-        }
-    }
-
+		try {
+			// Find the version that's currently installed.
+//			final IFacetedProject fproj = ProjectFacetsManager.create(project);
+//			final IProjectFacetVersion oldver = fproj.getInstalledVersion(fv.getProjectFacet());
+			monitor.worked(1);
+		}
+		finally {
+			monitor.done();
+		}
+	}
 }
diff --git a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
index f7b17f7..21375d3 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.400.qualifier
+Bundle-Version: 1.2.500.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/common/org/eclipse/jst/j2ee/internal/common/J2EEVersionUtil.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEVersionUtil.java
index 4ced94d..ed42814 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEVersionUtil.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEVersionUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2014 IBM Corporation and others.
+ * Copyright (c) 2005, 2021 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -47,6 +47,9 @@
 		
 		case J2EEVersionConstants.SERVLET_4_0:
 			return J2EEVersionConstants.VERSION_4_0_TEXT;
+
+		case J2EEVersionConstants.SERVLET_5_0:
+			return J2EEVersionConstants.VERSION_5_0_TEXT;
 		}
 		return ""; //$NON-NLS-1$
 
@@ -175,12 +178,14 @@
 			return J2EEVersionConstants.JEE_7_0_ID;
 		if (version.equals(J2EEVersionConstants.VERSION_4_0_TEXT))
 			return J2EEVersionConstants.JEE_8_0_ID;
+		if (version.equals(J2EEVersionConstants.VERSION_5_0_TEXT))
+			return J2EEVersionConstants.JEE_9_0_ID;
 		// default
-		return J2EEVersionConstants.J2EE_1_4_ID;
+		return J2EEVersionConstants.JEE_8_0_ID;
 	}
 	
 	public static int convertWebFragmentVersionStringToJ2EEVersionID(String version) {
-		return J2EEVersionConstants.JEE_6_0_ID;
+		return convertWebVersionStringToJ2EEVersionID(version);
 	}
 
 	public static int convertConnectorVersionStringToJ2EEVersionID(String version) {
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java
index fbe0974..40dd979 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2012 IBM Corporation and others.
+ * Copyright (c) 2009, 2021 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -235,7 +235,7 @@
 		
 		// since 2.0
 		node.put(Keys.J2EE_WEB_CONTENT, ProductManager.getProperty(IProductConstants.WEB_CONTENT_FOLDER));
-		node.put(Keys.STATIC_WEB_CONTENT, ProductManager.getProperty(IProductConstants.WEB_CONTENT_FOLDER));
+		node.put(Keys.STATIC_WEB_CONTENT, ProductManager.getProperty(IProductConstants.STATIC_WEB_CONTENT_FOLDER));
 		// since 2.0
 		node.put(Keys.JAVA_SOURCE, FacetCorePlugin.getJavaSrcFolder());
 		// done in CommonFrameworksPref..Initializer
diff --git a/plugins/org.eclipse.jst.j2ee/pom.xml b/plugins/org.eclipse.jst.j2ee/pom.xml
index 25a29f3..b345985 100644
--- a/plugins/org.eclipse.jst.j2ee/pom.xml
+++ b/plugins/org.eclipse.jst.j2ee/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.j2ee</artifactId>
-  <version>1.2.400-SNAPSHOT</version>
+  <version>1.2.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF
index cf4f623..b2748f1 100644
--- a/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jst.servlet.ui; singleton:=true
-Bundle-Version: 1.1.921.qualifier
+Bundle-Version: 1.1.1000.qualifier
 Bundle-Activator: org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin
 Bundle-Vendor: %pluginVendor
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.servlet.ui/plugin.xml b/plugins/org.eclipse.jst.servlet.ui/plugin.xml
index 58fd819..2625ec7 100644
--- a/plugins/org.eclipse.jst.servlet.ui/plugin.xml
+++ b/plugins/org.eclipse.jst.servlet.ui/plugin.xml
@@ -356,103 +356,7 @@
       id="org.eclipse.jst.j2ee.internal.web.container">
     </classpathContainerPage>
   </extension>
-  <extension
-        point="org.eclipse.ui.navigator.navigatorContent">
-     <navigatorContent
-           activeByDefault="true"
-           contentProvider="org.eclipse.jst.servlet.ui.internal.navigator.WebJavaContentProvider"
-           icon="icons/full/ctool16/webjava-icon.gif"
-           id="org.eclipse.jst.servlet.ui.EnhancedJavaRendering"
-           labelProvider="org.eclipse.jst.servlet.ui.internal.navigator.WebJavaLabelProvider"
-           name="%enhanced.java.for.web.name"
-           priority="higher">
-        <override
-              policy="InvokeOnlyIfSuppressedExtAlsoVisibleAndActive"
-              suppressedExtensionId="org.eclipse.jdt.java.ui.javaContent"/>					   
-        <triggerPoints>
-        	<or>
-				<and>
-					<adapt
-						type="org.eclipse.core.resources.IProject">
-						<or> 
-							<test forcePluginActivation="true"
-								property="org.eclipse.wst.common.project.facet.core.projectFacet"
-								value="jst.web" />
-						</or>
-					</adapt>
-				</and>
-				<instanceof value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
-			</or>        
-        </triggerPoints>
-        <possibleChildren>
-           <or>
-              <instanceof value="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaProject"/>
-              <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
-              <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
-              <instanceof value="org.eclipse.core.resources.IFolder"/>
-              <instanceof value="org.eclipse.jdt.internal.ui.packageview.ClassPathContainer"/>
-              <instanceof value="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaLibraries"/>
-           </or>
-        </possibleChildren> 
-		<actionProvider
-			class="org.eclipse.ui.internal.navigator.resources.actions.NewActionProvider"
-			id="org.eclipse.jst.servlet.ui.EnhancedJavaRendering.actions.NewActionProvider">
-			<enablement>
-				<instanceof
-					value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
-			</enablement>
-		</actionProvider>        
-        <commonSorter
-              class="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaSorter"
-              id="org.eclipse.jst.servlet.ui.EnhancedJavaRendering.sorter">
-           <parentExpression>
-              <instanceof value="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaProject"/>
-           </parentExpression>
-        </commonSorter>
- 
-		   <commonWizard
-		        type="new"
-		        wizardId="org.eclipse.jdt.ui.wizards.NewPackageCreationWizard">
-		     <enablement>
-				<instanceof
-					value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
-		     </enablement>
-		  </commonWizard>
-		  <commonWizard
-		        type="new"
-		        wizardId="org.eclipse.jdt.ui.wizards.NewClassCreationWizard">
-		     <enablement>
-				<instanceof
-					value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
-		     </enablement>
-		  </commonWizard>
 
-   	      <commonWizard
-		        type="new"
-		        wizardId="org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard">
-		     <enablement>
-				<instanceof
-					value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
-		     </enablement>
-		  </commonWizard> 
-		    <commonWizard
-		          type="new"
-		          wizardId="org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard">
-				<enablement>				        
-					<instanceof
-						value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
-			     </enablement>
-			 </commonWizard>        			 
-     </navigatorContent>
-  </extension>
-  <extension
-        point="org.eclipse.ui.navigator.viewer">
-     <viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
-        <includes>
-           <contentExtension pattern="org.eclipse.jst.servlet.ui.EnhancedJavaRendering"/>
-        </includes>
-     </viewerContentBinding>
-  </extension>
   <extension
         point="org.eclipse.core.runtime.adapters">
      <factory
diff --git a/plugins/org.eclipse.jst.servlet.ui/pom.xml b/plugins/org.eclipse.jst.servlet.ui/pom.xml
index 4a3a517..c0ca5c7 100644
--- a/plugins/org.eclipse.jst.servlet.ui/pom.xml
+++ b/plugins/org.eclipse.jst.servlet.ui/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.servlet.ui</artifactId>
-  <version>1.1.921-SNAPSHOT</version>
+  <version>1.1.1000-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/org.eclipse.jst.servlet.ui/property_files/web_ui.properties b/plugins/org.eclipse.jst.servlet.ui/property_files/web_ui.properties
index f885475..66e7241 100644
--- a/plugins/org.eclipse.jst.servlet.ui/property_files/web_ui.properties
+++ b/plugins/org.eclipse.jst.servlet.ui/property_files/web_ui.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
+# Copyright (c) 2003, 2020 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -12,7 +12,7 @@
 _1=New Dynamic Web Project
 _2=Servlet version:
 _3=Dynamic Web Project
-_4=Create a standalone Dynamic Web project or add it to a new or existing Enterprise Application.
+_4=Create a standalone Java-based Web Application or add it to a new or existing Enterprise Application.
 _5=Web &project:
 _6=WAR file:
 _7=Import a WAR file from the file system