[119623] WST and JST features have incorrect <requires> list
diff --git a/features/org.eclipse.wst.common_core.feature/feature.xml b/features/org.eclipse.wst.common_core.feature/feature.xml
index ff39a4b..1c3ba5e 100644
--- a/features/org.eclipse.wst.common_core.feature/feature.xml
+++ b/features/org.eclipse.wst.common_core.feature/feature.xml
@@ -8,16 +8,13 @@
%description
</description>
-
-
<license url="license.html">
%license
</license>
<requires>
- <import feature="org.eclipse.jem" version="1.1.0"/>
- <import feature="org.eclipse.emf" version="2.1.0"/>
- <import feature="org.eclipse.jdt" version="3.1.0"/>
+ <import feature="org.eclipse.jem" version="1.1.0.1" match="equivalent"/>
+ <import feature="org.eclipse.emf" version="2.1.1" match="equivalent"/>
</requires>
<plugin
@@ -32,7 +29,7 @@
download-size="0"
install-size="0"
version="0.0.0"/>
-
+
<plugin
id="org.eclipse.wst.command.env.core"
download-size="0"
diff --git a/features/org.eclipse.wst.common_ui.feature/feature.xml b/features/org.eclipse.wst.common_ui.feature/feature.xml
index 66dd0dd..0890c7b 100644
--- a/features/org.eclipse.wst.common_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.common_ui.feature/feature.xml
@@ -8,21 +8,18 @@
%description
</description>
-
-
<license url="license.html">
%license
</license>
- <requires>
- <import feature="org.eclipse.gef" version="3.1.0"/>
- </requires>
-
<includes
id="org.eclipse.wst.common_userdoc.feature"
version="0.0.0"/>
-
+ <requires>
+ <import feature="org.eclipse.gef" version="3.1.1" match="equivalent"/>
+ <import feature="org.eclipse.wst.common_core.feature" version="1.0.0" match="equivalent"/>
+ </requires>
<plugin
id="org.eclipse.wst.command.env.ui"
@@ -101,7 +98,6 @@
version="0.0.0"
unpack="false"/>
-
<plugin
id="org.eclipse.wst.validation.ui"
download-size="0"
