186506
Reintroduce features pre-reqing bundles
diff --git a/features/org.eclipse.jst.server_adapters.feature/feature.xml b/features/org.eclipse.jst.server_adapters.feature/feature.xml
index 049dc0b..7094c4d 100644
--- a/features/org.eclipse.jst.server_adapters.feature/feature.xml
+++ b/features/org.eclipse.jst.server_adapters.feature/feature.xml
@@ -21,6 +21,38 @@
<update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
</url>
+ <requires>
+ <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.commands" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.jdt.core" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.jdt.launching" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.wst.server.core" version="1.0.204" match="equivalent"/>
+ <import plugin="org.eclipse.jst.common.project.facet.core" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.emf.common" version="2.2.0"/>
+ <import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.forms" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.jdt.debug.ui" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.wst.server.ui" version="1.0.204" match="equivalent"/>
+ <import plugin="org.eclipse.jst.server.tomcat.core" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.wst.common.project.facet.ui" version="1.1.0"/>
+ <import plugin="org.eclipse.jst.j2ee" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.jst.j2ee.core" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.jst.j2ee.web" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.emf.ecore.xmi" version="2.2.0"/>
+ <import plugin="org.eclipse.wst.common.core" version="1.0.0" match="compatible"/>
+ <import plugin="org.eclipse.jst.server.core" version="1.0.102" match="equivalent"/>
+ <import plugin="org.eclipse.jst.server.generic.core" version="1.0.100" match="equivalent"/>
+ <import plugin="org.eclipse.jst.server.generic.ui" version="1.0.100" match="equivalent"/>
+ <import plugin="org.eclipse.jst.server.ui" version="1.0.102" match="equivalent"/>
+ <import plugin="org.eclipse.wst.common.project.facet.core" version="1.1.0" match="compatible"/>
+ </requires>
+
<plugin
id="org.eclipse.jst.server.preview.adapter"
download-size="0"
diff --git a/features/org.eclipse.jst.server_core.feature/feature.xml b/features/org.eclipse.jst.server_core.feature/feature.xml
index cbbef2a..04ca1e3 100644
--- a/features/org.eclipse.jst.server_core.feature/feature.xml
+++ b/features/org.eclipse.jst.server_core.feature/feature.xml
@@ -25,6 +25,23 @@
id="org.eclipse.jst.common_core.feature"
version="0.0.0"/>
+ <requires>
+ <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.expressions" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.jdt.core" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.jdt.launching" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.wst.server.core" version="1.0.103" match="equivalent"/>
+ <import plugin="org.eclipse.wst.common.project.facet.core" version="1.1.0" match="compatible"/>
+ <import plugin="org.eclipse.jst.server.core" version="1.0.102" match="equivalent"/>
+ <import plugin="org.eclipse.emf.common" version="2.2.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.ecore" version="2.2.0"/>
+ <import plugin="org.eclipse.emf.ecore.xmi" version="2.2.0"/>
+ <import plugin="org.apache.ant" version="1.6.5" match="compatible"/>
+ <import plugin="org.eclipse.core.variables" version="3.1.0" match="compatible"/>
+ </requires>
+
<plugin
id="org.eclipse.jst.server.core"
download-size="0"
@@ -45,4 +62,4 @@
install-size="0"
version="0.0.0"/>
-</feature>
\ No newline at end of file
+</feature>
diff --git a/features/org.eclipse.jst.server_ui.feature/feature.xml b/features/org.eclipse.jst.server_ui.feature/feature.xml
index 42661a4..d36cb12 100644
--- a/features/org.eclipse.jst.server_ui.feature/feature.xml
+++ b/features/org.eclipse.jst.server_ui.feature/feature.xml
@@ -29,6 +29,27 @@
id="org.eclipse.jst.server_core.feature"
version="0.0.0"/>
+ <requires>
+ <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.jdt.core" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.jdt.launching" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.jdt.junit" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.wst.server.core" version="1.0.103" match="equivalent"/>
+ <import plugin="org.eclipse.wst.server.ui" version="1.0.103" match="equivalent"/>
+ <import plugin="org.eclipse.jst.server.core" version="1.0.103" match="equivalent"/>
+ <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.jdt.ui" version="3.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.project.facet.ui" version="1.1.0"/>
+ <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.jdt.debug.ui" version="3.2.100" match="compatible"/>
+ <import plugin="org.eclipse.jst.server.generic.core" version="1.0.1"/>
+ <import plugin="org.eclipse.ui.forms" version="3.2.0" match="compatible"/>
+ </requires>
+
<plugin
id="org.eclipse.jst.server.ui"
download-size="0"
