re-computed dependancies
diff --git a/archive/org.eclipse.wtp.releng/maps/wtp-feature.map b/archive/org.eclipse.wtp.releng/maps/wtp-feature.map
index 0adb0e5..4beb1a8 100644
--- a/archive/org.eclipse.wtp.releng/maps/wtp-feature.map
+++ b/archive/org.eclipse.wtp.releng/maps/wtp-feature.map
@@ -1,11 +1,11 @@
feature@org.eclipse.wst=v20050601_1255,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/assembly/features/org.eclipse.wst
feature@org.eclipse.wst.sdk=v20050601_0212,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/assembly/features/org.eclipse.wst.sdk
feature@org.eclipse.jst=v20050601_1255,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/assembly/features/org.eclipse.jst
-feature@org.eclipse.jst.sdk=v20050418_1130,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/assembly/features/org.eclipse.jst.sdk
-feature@org.eclipse.wst.tests.feature=v20050531_0130,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/assembly/features/org.eclipse.wst.tests.feature
-feature@org.eclipse.wst.tests.performance.feature=v20050525_1100,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/assembly/features/org.eclipse.wst.tests.performance.feature
-feature@org.eclipse.jst.tests=v20050531_0130,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/assembly/features/org.eclipse.jst.tests
-feature@org.eclipse.jst.tests.performance.feature=v20050531_0130,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/assembly/features/org.eclipse.jst.tests.performance.feature
+feature@org.eclipse.jst.sdk=v20050601_1300,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/assembly/features/org.eclipse.jst.sdk
+feature@org.eclipse.wst.tests.feature=v20050601_1300,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/assembly/features/org.eclipse.wst.tests.feature
+feature@org.eclipse.wst.tests.performance.feature=v20050601_1300,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/assembly/features/org.eclipse.wst.tests.performance.feature
+feature@org.eclipse.jst.tests=v20050601_1300,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/assembly/features/org.eclipse.jst.tests
+feature@org.eclipse.jst.tests.performance.feature=v20050601_1300,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/assembly/features/org.eclipse.jst.tests.performance.feature
feature@org.apache.wsil4j.feature=v20050420_1028,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/assembly/features/org.apache.wsil4j.feature
feature@org.uddi4j.feature=v20050510_1508,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/assembly/features/org.uddi4j.feature
diff --git a/assembly/features/org.eclipse.jst.sdk/feature.xml b/assembly/features/org.eclipse.jst.sdk/feature.xml
index cd0b076..355ed85 100644
--- a/assembly/features/org.eclipse.jst.sdk/feature.xml
+++ b/assembly/features/org.eclipse.jst.sdk/feature.xml
@@ -24,6 +24,11 @@
version="1.0.0"
name="Web Standard Tools Feature SDK"/>
+ <requires>
+ <import plugin="org.eclipse.help" version="0.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.ui" version="0.0.0" match="greaterOrEqual"/>
+ </requires>
+
<plugin
id="org.eclipse.jst.source"
download-size="0"
diff --git a/assembly/features/org.eclipse.wst.tests.feature/feature.xml b/assembly/features/org.eclipse.wst.tests.feature/feature.xml
index dcce59c..c84ab85 100644
--- a/assembly/features/org.eclipse.wst.tests.feature/feature.xml
+++ b/assembly/features/org.eclipse.wst.tests.feature/feature.xml
@@ -6,12 +6,12 @@
provider-name="Eclipse.org">
<install-handler/>
+ <includes
+ id="org.eclipse.wst.sdk"
+ version="1.0.0"
+ name="Web Standard Tools Feature SDK"/>
+
<requires>
- <import plugin="org.eclipse.core.runtime.compatibility"/>
- <import plugin="org.wsdl4j"/>
- <import plugin="org.apache.ant"/>
- <import plugin="org.eclipse.core.boot"/>
- <import plugin="org.eclipse.wst.common.frameworks"/>
<import plugin="org.eclipse.core.runtime" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.resources" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.debug.core" version="0.0.0" match="greaterOrEqual"/>
@@ -42,29 +42,32 @@
<import plugin="org.eclipse.wst.xml.validation" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.wst.xsd.validation" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.wst.xml.uriresolver" version="0.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.wst.wsdl"/>
- <import plugin="org.eclipse.emf.ecore"/>
- <import plugin="org.eclipse.xsd"/>
- <import plugin="org.eclipse.wst.common.uriresolver"/>
+ <import plugin="org.wsdl4j" version="0.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.wst.common.uriresolver" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.core" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.wst.wsdl.validation" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.wst.ws.ui" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.wst.command.env.core" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.wst.command.env" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.wst.html.ui" version="0.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.wst.common.emfworkbench.integration"/>
- <import plugin="org.eclipse.emf.common"/>
- <import plugin="org.eclipse.wst.common.modulecore"/>
- <import plugin="org.eclipse.wst.common.frameworks.ui"/>
<import plugin="org.eclipse.wst.common.ui" version="0.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.wst.common.uriresolver" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.wst.dtd.core" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.wst.dtd.ui" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.wst.validation" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.wst.internet.cache" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.wst.wsi" version="0.0.0" match="greaterOrEqual"/>
- <import plugin="org.wsdl4j" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi" version="0.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.core.runtime.compatibility" version="0.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.wst.wsdl" version="0.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.emf.ecore" version="0.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.xsd" version="0.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.core.runtime" version="2.1.0" match="greaterOrEqual"/>
+ <import plugin="org.apache.ant" version="0.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.wst.common.frameworks" version="0.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="0.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.emf.common" version="0.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.wst.common.modulecore" version="0.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.wst.common.frameworks.ui" version="0.0.0" match="greaterOrEqual"/>
</requires>
<plugin