Revert "[581077] Servlet 6 projects are not launchable"

This reverts commit 590cc8515b735751c782bf15ef3a6a5509ef1707 to attempt avoiding
a conflict with gerrit 200340.

plugins/org.eclipse.jst.jee/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.jst.jee/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.jee/META-INF/MANIFEST.MF
index e764501..be3eec9 100644
--- a/plugins/org.eclipse.jst.jee/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.jee/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.jst.jee;singleton:=true
-Bundle-Version: 1.0.1200.qualifier
+Bundle-Version: 1.0.1100.qualifier
 Bundle-Activator: org.eclipse.jst.jee.JEEPlugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",

plugins/org.eclipse.jst.jee/plugin.xml

diff --git a/plugins/org.eclipse.jst.jee/plugin.xml b/plugins/org.eclipse.jst.jee/plugin.xml
index cee7911..5cd00cb 100644
--- a/plugins/org.eclipse.jst.jee/plugin.xml
+++ b/plugins/org.eclipse.jst.jee/plugin.xml
@@ -257,7 +257,7 @@
          </moduleType>
          <moduleType
                types="jst.web"
-               versions="6.1,6.0,5.0,4.0,3.1,3.0,2.5,2.4,2.3,2.2">
+               versions="5.0,4.0,3.1,3.0,2.5,2.4,2.3,2.2">
          </moduleType>
          <moduleType
                types="jst.ejb"
@@ -273,17 +273,17 @@
          </moduleType>
          <moduleType
                types="jst.webfragment"
-               versions="6.0,5.0,4.0,3.1,3.0">
+               versions="5.0,4.0,3.1,3.0">
          </moduleType> 
          <enablement>
 			<or>
-				<test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.appclient:8.0]" />
-				<test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.ejb:3.2]" />
-				<test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.utility:1.0]" />
-				<test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.connector:1.7]" />
-				<test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.web:6.1]" />
-				<test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.ear:[5.0-8.0]" />
-				<test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.webfragment:6.0]" />
+        		<test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.appclient:8.0]"/>
+		  		<test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.ejb:3.2]"/>
+		  		<test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.utility:1.0]"/>
+	  			<test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.connector:1.7]"/>
+	  			<test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.web:5.0]"/>
+	  			<test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.ear:[5.0-8.0]"/>
+	  			<test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.webfragment:5.0]"/>
 			</or>
 		</enablement>        
       </moduleFactory>

plugins/org.eclipse.jst.jee/pom.xml

diff --git a/plugins/org.eclipse.jst.jee/pom.xml b/plugins/org.eclipse.jst.jee/pom.xml
index ec322f9..be9d74e 100644
--- a/plugins/org.eclipse.jst.jee/pom.xml
+++ b/plugins/org.eclipse.jst.jee/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.jee</artifactId>
-  <version>1.0.1200-SNAPSHOT</version>
+  <version>1.0.1100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>