[releng] Eliminate redundant feature dependencies
diff --git a/doc/org.eclipse.m2m.qvt.oml.doc-feature/feature.xml b/doc/org.eclipse.m2m.qvt.oml.doc-feature/feature.xml
index 55639e5..dacb6aa 100644
--- a/doc/org.eclipse.m2m.qvt.oml.doc-feature/feature.xml
+++ b/doc/org.eclipse.m2m.qvt.oml.doc-feature/feature.xml
@@ -16,10 +16,6 @@
%copyright
</copyright>
- <requires>
- <import plugin="org.eclipse.help" version="3.4.0" match="compatible"/>
- </requires>
-
<plugin
id="org.eclipse.m2m.qvt.oml.doc"
download-size="0"
diff --git a/examples/org.eclipse.m2m.qvt.oml.examples-feature/feature.xml b/examples/org.eclipse.m2m.qvt.oml.examples-feature/feature.xml
index 3912e1d..0a20f81 100644
--- a/examples/org.eclipse.m2m.qvt.oml.examples-feature/feature.xml
+++ b/examples/org.eclipse.m2m.qvt.oml.examples-feature/feature.xml
@@ -1,41 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.m2m.qvt.oml.examples"
- label="%featureName"
- version="3.2.0.qualifier"
- provider-name="%providerName"
- plugin="org.eclipse.m2m.qvt.oml.samples"
- image="eclipse_update_120.jpg"
- license-feature="org.eclipse.qvto.license"
- license-feature-version="1.0.0.qualifier">
-
- <description url="http://www.eclipse.org/mmt/qvto">
- %description
- </description>
-
- <copyright url="http://www.eclipse.org/legal/epl-v10.html">
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <requires>
- <import plugin="org.eclipse.core.runtime" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.ui.ide" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore" version="2.5.0" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore.xmi" version="2.5.0" match="compatible"/>
- <import plugin="org.eclipse.emf.edit.ui" version="2.5.0" match="compatible"/>
- <import plugin="org.eclipse.debug.core" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.common" version="3.0.0" match="compatible"/>
- </requires>
-
- <plugin
- id="org.eclipse.m2m.qvt.oml.samples"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.m2m.qvt.oml.examples"
+ label="%featureName"
+ version="3.2.0.qualifier"
+ provider-name="%providerName"
+ plugin="org.eclipse.m2m.qvt.oml.samples"
+ image="eclipse_update_120.jpg"
+ license-feature="org.eclipse.qvto.license"
+ license-feature-version="1.0.0.qualifier">
+
+ <description url="http://www.eclipse.org/mmt/qvto">
+ %description
+ </description>
+
+ <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.m2m.qvt.oml.samples"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.m2m.qvt.oml.debug.feature/feature.xml b/features/org.eclipse.m2m.qvt.oml.debug.feature/feature.xml
index 86b5541..cd7cb03 100644
--- a/features/org.eclipse.m2m.qvt.oml.debug.feature/feature.xml
+++ b/features/org.eclipse.m2m.qvt.oml.debug.feature/feature.xml
@@ -26,33 +26,6 @@
%copyright
</copyright>
- <requires>
- <import plugin="org.eclipse.core.runtime" version="3.6.0" match="compatible"/>
- <import plugin="org.eclipse.pde.launching" version="3.6.0" match="compatible"/>
- <import plugin="org.eclipse.debug.core" version="3.6.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.core.expressions" version="3.4.100" match="compatible"/>
- <import plugin="org.eclipse.ui" version="3.6.0" match="compatible"/>
- <import plugin="org.eclipse.ui.editors" version="3.6.0" match="compatible"/>
- <import plugin="org.eclipse.ui.ide" version="3.6.0" match="compatible"/>
- <import plugin="org.eclipse.ui.workbench.texteditor" version="3.6.0" match="compatible"/>
- <import plugin="org.eclipse.debug.ui" version="3.6.0" match="compatible"/>
- <import plugin="org.eclipse.pde.ui" version="3.6.0" match="compatible"/>
- <import plugin="org.eclipse.jdt.debug.ui" version="3.5.0" match="compatible"/>
- <import plugin="org.eclipse.jface.text" version="3.5.100" match="compatible"/>
- <import plugin="org.eclipse.ui.console" version="3.5.0" match="compatible"/>
- <import plugin="org.eclipse.jface" version="3.6.0" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore" version="2.6.0"/>
- <import plugin="org.eclipse.m2m.qvt.oml.debug.core" version="1.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.runtime" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.common" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.emf.util" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.editor.ui" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.common.ui" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.project" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.runtime.ui" version="3.0.0" match="compatible"/>
- </requires>
-
<plugin
id="org.eclipse.m2m.qvt.oml.debug.core"
download-size="0"
diff --git a/features/org.eclipse.m2m.qvt.oml.editor.feature/feature.xml b/features/org.eclipse.m2m.qvt.oml.editor.feature/feature.xml
index 19691b5..87bb633 100644
--- a/features/org.eclipse.m2m.qvt.oml.editor.feature/feature.xml
+++ b/features/org.eclipse.m2m.qvt.oml.editor.feature/feature.xml
@@ -1,52 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.m2m.qvt.oml.editor"
- label="%featureName"
- version="3.2.0.qualifier"
- provider-name="%providerName"
- plugin="org.eclipse.m2m.qvt.oml.editor.ui"
- image="eclipse_update_120.jpg"
- license-feature="org.eclipse.qvto.license"
- license-feature-version="1.0.0.qualifier">
-
- <description url="http://www.eclipse.org/mmt/qvto">
- %description
- </description>
-
- <copyright url="http://www.eclipse.org/legal/epl-v10.html">
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <requires>
- <import plugin="org.eclipse.core.resources" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.core.runtime" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore" version="2.5.0" match="compatible"/>
- <import plugin="org.eclipse.jface.text" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.ui" version="3.5.0" match="compatible"/>
- <import plugin="org.eclipse.ui.views" version="3.3.0" match="compatible"/>
- <import plugin="org.eclipse.ui.editors" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.compare" version="3.5.0" match="compatible"/>
- <import plugin="org.eclipse.ui.workbench.texteditor" version="3.5.0" match="compatible"/>
- <import plugin="org.eclipse.ui.ide" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.jdt.ui" version="3.5.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.ocl" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.common" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.common.ui" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.emf.util" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.project" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.runtime" version="3.0.0" match="compatible"/>
- </requires>
-
- <plugin
- id="org.eclipse.m2m.qvt.oml.editor.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.m2m.qvt.oml.editor"
+ label="%featureName"
+ version="3.2.0.qualifier"
+ provider-name="%providerName"
+ plugin="org.eclipse.m2m.qvt.oml.editor.ui"
+ image="eclipse_update_120.jpg"
+ license-feature="org.eclipse.qvto.license"
+ license-feature-version="1.0.0.qualifier">
+
+ <description url="http://www.eclipse.org/mmt/qvto">
+ %description
+ </description>
+
+ <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.m2m.qvt.oml.editor.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.m2m.qvt.oml.feature/feature.xml b/features/org.eclipse.m2m.qvt.oml.feature/feature.xml
index a2dd090..4c95a6e 100644
--- a/features/org.eclipse.m2m.qvt.oml.feature/feature.xml
+++ b/features/org.eclipse.m2m.qvt.oml.feature/feature.xml
@@ -17,23 +17,6 @@
%copyright
</copyright>
- <requires>
- <import plugin="org.eclipse.core.runtime" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.core.resources" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore" version="2.5.0" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore.xmi" version="2.5.0" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore.change" version="2.4.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.common" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.emf.util" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.cst.parser" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.ocl.ecore" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.ecore.imperativeocl" version="3.0.0" match="compatible"/>
- <import plugin="com.ibm.icu"/>
- <import plugin="org.eclipse.ocl" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/>
- <import plugin="org.eclipse.core.filesystem" version="1.2.0" match="compatible"/>
- </requires>
-
<plugin
id="org.eclipse.m2m.qvt.oml"
download-size="0"
diff --git a/features/org.eclipse.m2m.qvt.oml.runtime.feature/feature.xml b/features/org.eclipse.m2m.qvt.oml.runtime.feature/feature.xml
index 0beca96..7473e21 100644
--- a/features/org.eclipse.m2m.qvt.oml.runtime.feature/feature.xml
+++ b/features/org.eclipse.m2m.qvt.oml.runtime.feature/feature.xml
@@ -17,30 +17,6 @@
%copyright
</copyright>
- <requires>
- <import plugin="org.eclipse.core.runtime" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.core.resources" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.common" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.emf.util" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.runtime" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.core.variables" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore.xmi" version="2.5.0" match="compatible"/>
- <import plugin="org.eclipse.debug.ui" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.ui.ide" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.ui.workbench.texteditor" version="3.5.0" match="compatible"/>
- <import plugin="org.eclipse.jface.text" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.common.ui" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.emf.util.ui" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.project" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.emf.edit.ui" version="2.5.0" match="compatible"/>
- <import plugin="org.eclipse.emf.edit" version="2.4.0" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore" version="2.5.0" match="compatible"/>
- <import plugin="org.eclipse.emf.codegen.ecore.ui" version="2.5.0" match="compatible"/>
- <import plugin="org.eclipse.ui.editors" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.core.expressions" version="3.4.0" match="compatible"/>
- </requires>
-
<plugin
id="org.eclipse.m2m.qvt.oml.ocl"
download-size="0"
diff --git a/features/org.eclipse.m2m.qvt.oml.sdk-feature/feature.xml b/features/org.eclipse.m2m.qvt.oml.sdk-feature/feature.xml
index 90dc022..9bc10a7 100644
--- a/features/org.eclipse.m2m.qvt.oml.sdk-feature/feature.xml
+++ b/features/org.eclipse.m2m.qvt.oml.sdk-feature/feature.xml
@@ -57,24 +57,6 @@
id="org.eclipse.m2m.qvt.oml.debug.source"
version="0.0.0"/>
- <requires>
- <import plugin="org.eclipse.core.runtime" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.core.resources" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.jdt.core" version="3.5.0" match="compatible"/>
- <import plugin="org.eclipse.jdt.launching" version="3.5.0" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore" version="2.5.0" match="compatible"/>
- <import plugin="org.eclipse.emf.common.ui" version="2.4.0" match="compatible"/>
- <import plugin="org.eclipse.pde.ui" version="3.5.0" match="compatible"/>
- <import plugin="org.eclipse.ui" version="3.5.0" match="compatible"/>
- <import plugin="org.eclipse.ui.ide" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml" version="3.0.0" match="compatible"/>
- <import plugin="com.ibm.icu"/>
- <import plugin="org.eclipse.m2m.qvt.oml.common" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.common.ui" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.emf.util" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.project" version="3.0.0" match="compatible"/>
- </requires>
-
<plugin
id="org.eclipse.m2m.qvt.oml.ui"
download-size="0"
diff --git a/features/org.eclipse.m2m.qvt.oml.tests-feature/feature.xml b/features/org.eclipse.m2m.qvt.oml.tests-feature/feature.xml
index 9eecf3f..c4e63d3 100644
--- a/features/org.eclipse.m2m.qvt.oml.tests-feature/feature.xml
+++ b/features/org.eclipse.m2m.qvt.oml.tests-feature/feature.xml
@@ -1,72 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.m2m.qvt.oml.tests"
- label="%featureName"
- version="3.2.0.qualifier"
- provider-name="%providerName"
- plugin="org.eclipse.m2m.tests.qvt.oml"
- image="eclipse_update_120.jpg"
- license-feature="org.eclipse.qvto.license"
- license-feature-version="1.0.0.qualifier">
-
- <description url="http://www.eclipse.org/mmt/qvto">
- %description
- </description>
-
- <copyright url="http://www.eclipse.org/legal/epl-v10.html">
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <requires>
- <import plugin="org.junit4" version="4.5.0" match="compatible"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.emf.codegen.ecore"/>
- <import plugin="org.eclipse.m2m.qvt.oml"/>
- <import plugin="org.eclipse.m2m.qvt.oml.common"/>
- <import plugin="org.eclipse.m2m.qvt.oml.emf.util"/>
- <import plugin="org.eclipse.m2m.qvt.oml.runtime"/>
- <import plugin="org.eclipse.m2m.qvt.oml.project"/>
- <import plugin="org.eclipse.m2m.qvt.oml.ocl"/>
- <import plugin="org.eclipse.m2m.qvt.oml.samples"/>
- <import plugin="org.eclipse.ant.core"/>
- <import plugin="org.eclipse.debug.core"/>
- <import plugin="org.eclipse.jface.text"/>
- <import plugin="org.eclipse.m2m.qvt.oml.editor.ui"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.ui.editors"/>
- </requires>
-
- <plugin
- id="org.eclipse.m2m.tests.qvt.oml"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.m2m.tests.qvt.oml.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ant.optional.junit"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"/>
-
- <plugin
- id="org.eclipse.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.m2m.qvt.oml.tests"
+ label="%featureName"
+ version="3.2.0.qualifier"
+ provider-name="%providerName"
+ plugin="org.eclipse.m2m.tests.qvt.oml"
+ image="eclipse_update_120.jpg"
+ license-feature="org.eclipse.qvto.license"
+ license-feature-version="1.0.0.qualifier">
+
+ <description url="http://www.eclipse.org/mmt/qvto">
+ %description
+ </description>
+
+ <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.m2m.tests.qvt.oml"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.m2m.tests.qvt.oml.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.ant.optional.junit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"/>
+
+ <plugin
+ id="org.eclipse.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+</feature>
