move feature versions up to 3.0
diff --git a/features/org.eclipse.wst.web_core.feature/feature.xml b/features/org.eclipse.wst.web_core.feature/feature.xml
index f8fd8c3..30d749c 100644
--- a/features/org.eclipse.wst.web_core.feature/feature.xml
+++ b/features/org.eclipse.wst.web_core.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.web_core.feature"
       label="%featureName"
-      version="2.1.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -22,24 +22,24 @@
    </url>
 
    <requires>
-      <import plugin="org.apache.xerces" version="2.8.0" />
-      <import plugin="org.eclipse.wst.xml.core" version="1.1.0" />
-      <import plugin="org.eclipse.wst.sse.core" version="1.1.0" />
       <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
       <import plugin="com.ibm.icu" version="3.4.4" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" />
-      <import plugin="org.eclipse.wst.css.core" version="1.1.0" />
-      <import plugin="org.eclipse.wst.common.frameworks" version="1.1.0" />
       <import plugin="org.eclipse.core.commands" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.validation" version="1.1.0" />
-      <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.1.0" />
-      <import plugin="org.eclipse.wst.server.core" version="1.0.102" />
       <import plugin="org.eclipse.jem.util" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" />
       <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
       <import plugin="org.eclipse.wst.common.project.facet.core" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.environment" version="1.0.100" />
+      <import plugin="org.apache.xerces" version="2.8.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.xml.core" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.css.core" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.common.frameworks" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.validation" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.server.core" version="1.0.102" match="compatible"/>
+      <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.common.environment" version="1.0.100" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/feature.xml
index 010d305..3f60349 100644
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/feature.xml
+++ b/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.web_core.feature.source"
       label="%featureName"
-      version="2.1.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/features/org.eclipse.wst.web_sdk.feature/feature.xml b/features/org.eclipse.wst.web_sdk.feature/feature.xml
index 4c389a5..8fcdd0d 100644
--- a/features/org.eclipse.wst.web_sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.web_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.web_sdk.feature"
       label="%featureName"
-      version="2.1.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/features/org.eclipse.wst.web_ui.feature/feature.xml b/features/org.eclipse.wst.web_ui.feature/feature.xml
index 52267ea..43b24a1 100644
--- a/features/org.eclipse.wst.web_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.web_ui.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.web_ui.feature"
       label="%featureName"
-      version="2.1.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -34,34 +34,50 @@
          version="0.0.0"/>
 
    <requires>
-      <import plugin="org.eclipse.ui.ide" version="3.2.0" />
-      <import plugin="org.eclipse.ui.views" version="3.2.0" />
-      <import plugin="org.eclipse.jface.text" version="3.2.0" />
-      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.2.0" />
-      <import plugin="org.eclipse.ui" version="3.2.0" />
-      <import plugin="org.eclipse.wst.xml.ui" version="1.0.100" />
-      <import plugin="org.eclipse.wst.sse.ui" version="1.0.101" />
-      <import plugin="org.eclipse.wst.css.core" version="1.1.0" />
-      <import plugin="org.eclipse.wst.sse.core" version="1.1.0" />
-      <import plugin="org.eclipse.wst.html.core" version="1.1.0" />
-      <import plugin="org.eclipse.wst.xml.core" version="1.1.0" />
-      <import plugin="org.eclipse.core.resources" version="3.2.0" />
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" />
-      <import plugin="org.eclipse.wst.common.project.facet.core" version="1.1.0" />
-      <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" />
-      <import plugin="com.ibm.icu" version="3.4.4" />
-      <import plugin="org.eclipse.wst.css.ui" version="1.0.100" />
-      <import plugin="org.eclipse.wst.validation" version="1.1.0" />
-      <import plugin="org.eclipse.wst.javascript.ui" version="1.0.0" />
-      <import plugin="org.eclipse.debug.ui" version="3.2.0" />
-      <import plugin="org.eclipse.wst.javascript.core" version="1.0.0" />
-      <import plugin="org.eclipse.wst.common.frameworks" version="1.1.0" />
-      <import plugin="org.eclipse.wst.common.frameworks.ui" version="1.1.0" />
-      <import plugin="org.eclipse.wst.web" version="1.1.0" />
-      <import plugin="org.eclipse.wst.common.project.facet.ui" version="1.1.0" />
-      <import plugin="org.eclipse.wst.server.ui" version="1.0.102" />
-      <import plugin="org.eclipse.wst.common.environment" version="1.0.100" />
-      <import plugin="org.eclipse.emf.ecore" version="2.2.0" />
+      <import plugin="org.eclipse.jface.text" version="3.2.0"/>
+      <import plugin="org.eclipse.wst.common.project.facet.core" version="1.1.0"/>
+      <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0"/>
+      <import plugin="org.eclipse.wst.sse.ui" version="1.0.101"/>
+      <import plugin="org.eclipse.wst.common.project.facet.ui" version="1.1.0"/>
+      <import plugin="com.ibm.icu" version="3.4.4" match="compatible"/>
+      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.core.filebuffers" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.xml.core" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.html.core" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.validation" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.jsdt.core"/>
+      <import plugin="org.eclipse.swt"/>
+      <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.xml.ui" version="1.0.100" match="compatible"/>
+      <import plugin="org.eclipse.wst.css.core" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.search" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.ltk.core.refactoring" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.jsdt.ui"/>
+      <import plugin="org.eclipse.wst.jsdt.manipulation"/>
+      <import plugin="org.eclipse.ui.views" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.sse.ui" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.css.ui" version="1.0.100" match="compatible"/>
+      <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.javascript.core" version="1.0.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.common.frameworks" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.common.frameworks.ui" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.web" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.common.project.facet.core" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.server.ui" version="1.0.102" match="compatible"/>
+      <import plugin="org.eclipse.wst.common.environment" version="1.0.100" match="compatible"/>
+      <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.console" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.css.ui" version="1.0.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.html.ui" version="1.0.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.javascript.ui" version="1.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/feature.xml
index 2b82176..f1044d1 100644
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/feature.xml
+++ b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.web_ui.feature.source"
       label="%featureName"
-      version="2.1.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/features/org.eclipse.wst.web_userdoc.feature/feature.xml b/features/org.eclipse.wst.web_userdoc.feature/feature.xml
index 4635030..bd82db8 100644
--- a/features/org.eclipse.wst.web_userdoc.feature/feature.xml
+++ b/features/org.eclipse.wst.web_userdoc.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.web_userdoc.feature"
       label="%featureName"
-      version="2.1.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/features/org.eclipse.wst.xml_core.feature/feature.xml b/features/org.eclipse.wst.xml_core.feature/feature.xml
index abf4933..c88dd9e 100644
--- a/features/org.eclipse.wst.xml_core.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_core.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.xml_core.feature"
       label="%featureName"
-      version="2.1.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -33,11 +33,11 @@
       <import plugin="org.eclipse.text" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.core.filebuffers" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.emf.common" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.xml.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.validation" version="1.1.0" match="equivalent"/>
+      <import plugin="org.eclipse.wst.xml.core" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.common.core" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.validation" version="1.1.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/feature.xml
index 3aed4d9..e70f4d6 100644
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/feature.xml
+++ b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.xml_core.feature.source"
       label="%featureName"
-      version="2.1.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/features/org.eclipse.wst.xml_sdk.feature/feature.xml b/features/org.eclipse.wst.xml_sdk.feature/feature.xml
index 4214f51..6e14f59 100644
--- a/features/org.eclipse.wst.xml_sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.xml_sdk.feature"
       label="%featureName"
-      version="2.1.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/features/org.eclipse.wst.xml_ui.feature/feature.xml b/features/org.eclipse.wst.xml_ui.feature/feature.xml
index f9c83ca..d5ccf43 100644
--- a/features/org.eclipse.wst.xml_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_ui.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.xml_ui.feature"
       label="%featureName"
-      version="2.1.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -31,35 +31,36 @@
          version="0.0.0"/>
 
    <requires>
-      <import plugin="org.eclipse.core.resources" version="3.2.0" />
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" />
-      <import plugin="org.eclipse.jface.text" version="3.2.0" />
-      <import plugin="org.eclipse.ui.ide" version="3.2.0" />
-      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.2.0" />
-      <import plugin="org.eclipse.wst.common.ui" version="1.1.0" />
-      <import plugin="org.eclipse.wst.dtd.core" version="1.1.0" />
-      <import plugin="org.eclipse.wst.sse.core" version="1.1.0" />
-      <import plugin="org.eclipse.wst.xml.core" version="1.1.0" />
-      <import plugin="org.eclipse.wst.xml.ui" version="1.0.100" />
-      <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" />
-      <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.2.0" />
-      <import plugin="com.ibm.icu" version="3.4.4" />
-      <import plugin="org.eclipse.debug.ui" version="3.2.0" />
-      <import plugin="org.eclipse.ui.editors" version="3.2.0" />
-      <import plugin="org.eclipse.search" version="3.2.0" />
-      <import plugin="org.eclipse.ui" version="3.2.0" />
-      <import plugin="org.eclipse.ui.views" version="3.2.0" />
-      <import plugin="org.eclipse.wst.validation" version="1.1.0" />
-      <import plugin="org.eclipse.emf.common" version="2.2.0" />
-      <import plugin="org.eclipse.wst.common.core" version="1.1.0" />
-      <import plugin="org.eclipse.gef" version="3.2.0" />
-      <import plugin="org.eclipse.emf.ecore.edit" version="2.2.0" />
-      <import plugin="org.eclipse.xsd.edit" version="2.2.0" />
-      <import plugin="org.eclipse.emf.edit.ui" version="2.2.0" />
-      <import plugin="org.eclipse.ltk.core.refactoring" version="3.2.0" />
-      <import plugin="org.eclipse.ltk.ui.refactoring" version="3.2.0" />
-      <import plugin="org.eclipse.wst.xsd.core" version="1.1.0" />
       <import plugin="org.eclipse.wst.sse.ui" version="1.0.101"/>
+      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.common.ui" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.dtd.core" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.xml.core" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.xml.ui" version="1.0.100" match="compatible"/>
+      <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.2.0" match="compatible"/>
+      <import plugin="com.ibm.icu" version="3.4.4" match="compatible"/>
+      <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.editors" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.search" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.views" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.validation" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.emf.common" version="2.2.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.sse.ui" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.common.core" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.gef" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.emf.ecore.edit" version="2.2.0" match="compatible"/>
+      <import plugin="org.eclipse.xsd.edit" version="2.2.0" match="compatible"/>
+      <import plugin="org.eclipse.emf.edit.ui" version="2.2.0" match="compatible"/>
+      <import plugin="org.eclipse.ltk.core.refactoring" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.ltk.ui.refactoring" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.xsd.core" version="1.1.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.xml
index 687cb75..ec97e31 100644
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.xml
+++ b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.xml_ui.feature.source"
       label="%featureName"
-      version="2.1.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/features/org.eclipse.wst.xml_userdoc.feature/feature.xml b/features/org.eclipse.wst.xml_userdoc.feature/feature.xml
index 563bd25..673f794 100644
--- a/features/org.eclipse.wst.xml_userdoc.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_userdoc.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.xml_userdoc.feature"
       label="%featureName"
-      version="2.1.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName">
 
    <description>