[119623] WST and JST features have incorrect <requires> list
diff --git a/features/org.eclipse.wst.web_core.feature/feature.xml b/features/org.eclipse.wst.web_core.feature/feature.xml
index 35db676..04d7f57 100644
--- a/features/org.eclipse.wst.web_core.feature/feature.xml
+++ b/features/org.eclipse.wst.web_core.feature/feature.xml
@@ -8,12 +8,18 @@
       %description
    </description>
 
-
-
    <license url="license.html">
       %license
    </license>
 
+   <requires>
+      <import feature="org.eclipse.platform" version="3.1.1" match="equivalent"/>
+      <import feature="org.eclipse.emf" version="2.1.1" match="equivalent"/>
+      <import feature="org.eclipse.jem" version="1.1.0.1" match="equivalent"/>
+      <import feature="org.eclipse.wst.server_core.feature" version="1.0.0" match="equivalent"/>
+      <import feature="org.eclipse.wst.common_core.feature" version="1.0.0" match="equivalent"/>
+   </requires>
+
    <plugin
          id="org.eclipse.wst.css.core"
          download-size="0"
diff --git a/features/org.eclipse.wst.web_ui.feature/feature.xml b/features/org.eclipse.wst.web_ui.feature/feature.xml
index fbbee36..3d075c5 100644
--- a/features/org.eclipse.wst.web_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.web_ui.feature/feature.xml
@@ -8,17 +8,18 @@
       %description
    </description>
 
-
-
    <license url="license.html">
       %license
    </license>
 
-
    <includes
          id="org.eclipse.wst.web_userdoc.feature"
          version="0.0.0"/>
 
+   <requires>
+      <import feature="org.eclipse.wst.web_core.feature" version="1.0.0"/>
+   </requires>
+
    <plugin
          id="org.eclipse.wst.html.ui.infopop"
          download-size="0"
diff --git a/features/org.eclipse.wst.xml_core.feature/feature.xml b/features/org.eclipse.wst.xml_core.feature/feature.xml
index ae35b8a..487684c 100644
--- a/features/org.eclipse.wst.xml_core.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_core.feature/feature.xml
@@ -8,18 +8,19 @@
       %description
    </description>
 
-
-
    <license url="license.html">
       %license
    </license>
 
-
    <requires>
-      <import feature="org.apache.xerces.feature" version="2.7.0"/>
+      <import feature="org.apache.xerces.feature" version="2.7.0" match="equivalent"/>
+      <import feature="org.eclipse.rcp" version="3.1.1" match="equivalent"/>
+      <import feature="org.eclipse.platform" version="3.1.1" match="equivalent"/>
+      <import feature="org.eclipse.emf" version="2.1.1" match="equivalent"/>
+      <import feature="org.eclipse.wst.common_core.feature" version="1.0.0" match="equivalent"/>
+      <import feature="org.eclipse.xsd" version="2.1.1" match="equivalent"/>
    </requires>
 
-
    <plugin
          id="org.eclipse.wst.xml.core"
          download-size="0"
diff --git a/features/org.eclipse.wst.xml_ui.feature/feature.xml b/features/org.eclipse.wst.xml_ui.feature/feature.xml
index 52f482c..ea3d4a1 100644
--- a/features/org.eclipse.wst.xml_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_ui.feature/feature.xml
@@ -8,24 +8,20 @@
       %description
    </description>
 
-
-
    <license url="license.html">
       %license
    </license>
 
-   <requires>
-      <import feature="org.apache.xerces.feature" version="2.7.0"/>
-      <import feature="org.eclipse.wst.xml_core.feature" version="0.0.0"/>
-      <import feature="org.eclipse.wst.common_ui.feature" version="0.0.0"/>
-   </requires>
-
-
-
    <includes
          id="org.eclipse.wst.xml_userdoc.feature"
          version="0.0.0"/>
 
+   <requires>
+      <import feature="org.apache.xerces.feature" version="2.7.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.wst.xml_core.feature" version="1.0.0" match="equivalent"/>
+      <import feature="org.eclipse.wst.common_ui.feature" version="1.0.0" match="equivalent"/>
+      <import feature="org.eclipse.gef" version="3.1.1" match="equivalent"/>
+   </requires>
 
    <plugin
          id="org.eclipse.wst.dtd.ui"