Releng: Improve TCF/TE Eclipse feature definitions

- Switch from including org.eclipse.tcf.* features into each other to require those features instead. More flexible P2 dependency resolution at install time.
- Require the com.google.gson plugin instead of declaring it part of the org.eclipse.tcf.te.feature. More flexible P2 dependency resolution at install time.
- com.google.gson plugin explicitly included into P2 repository aggregation via category.xml

9 files changed, 23 insertions, 71 deletions

diff --git a/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml
index bbf7c5c52..2340d2432 100644
--- a/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml
@@ -23,6 +23,7 @@
    </url>
 
    <requires>
+      <import plugin="com.google.gson" version="2.2.4" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.te.runtime" version="1.2.0" match="greaterOrEqual"/>
@@ -233,11 +234,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.google.gson"
-         download-size="0"
-         install-size="0"
-         version="2.2.4.v201311231704"
-         unpack="false"/>
-
 </feature>
diff --git a/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.xml
index efa44db8b..bc16b120b 100644
--- a/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.xml
@@ -21,12 +21,10 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
    </url>
 
-   <includes
-         id="org.eclipse.tcf.te.feature"
-         version="0.0.0"/>
-
    <requires>
+      <import plugin="com.google.gson.source" version="2.2.4" match="greaterOrEqual"/>
       <import feature="org.eclipse.tm.terminal.core.sdk" version="3.3.100" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.feature" version="1.2.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
@@ -197,11 +195,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.google.gson.source"
-         download-size="0"
-         install-size="0"
-         version="2.2.4.v201311231704"
-         unpack="false"/>
-
 </feature>
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.core.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.core.feature/feature.xml
index 2a9ca1fe9..8d0a819f6 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.core.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.core.feature/feature.xml
@@ -22,14 +22,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
    </url>
 
-   <includes
-         id="org.eclipse.tcf.core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.tcf.te.feature"
-         version="0.0.0"/>
-
    <requires>
       <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
@@ -70,6 +62,8 @@
       <import plugin="org.eclipse.tcf.te.tcf.core.scripting" version="1.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.te.tcf.log.core" version="1.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.te.tcf.ui.console" version="1.2.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.core.feature" version="1.2.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.feature" version="1.2.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.core.sdk.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.core.sdk.feature/feature.xml
index d888c2811..057a55ffb 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.core.sdk.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.core.sdk.feature/feature.xml
@@ -21,17 +21,11 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
    </url>
 
-   <includes
-         id="org.eclipse.tcf.core.sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.tcf.te.sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.tcf.te.tcf.core.feature"
-         version="0.0.0"/>
+   <requires>
+      <import feature="org.eclipse.tcf.core.sdk.feature" version="1.2.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.sdk.feature" version="1.2.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.tcf.core.feature" version="1.2.0" match="greaterOrEqual"/>
+   </requires>
 
    <plugin
          id="org.eclipse.tcf.te.tcf.core.source"
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.xml
index 658db1ef1..4506a1406 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.xml
@@ -22,14 +22,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
    </url>
 
-   <includes
-         id="org.eclipse.tcf.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.tcf.te.tcf.core.feature"
-         version="0.0.0"/>
-
    <requires>
       <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.debug.core" version="3.7.100" match="greaterOrEqual"/>
@@ -64,6 +56,8 @@
       <import plugin="org.eclipse.tcf.te.ui.swt" version="1.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.te.ui.views" version="1.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.te.ui" version="1.2.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.feature" version="1.2.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.tcf.core.feature" version="1.2.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.feature/feature.xml
index 75bfedc23..88da09cbe 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.feature/feature.xml
@@ -22,10 +22,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
    </url>
 
-   <includes
-         id="org.eclipse.tcf.te.tcf.core.feature"
-         version="0.0.0"/>
-
    <requires>
       <import plugin="org.eclipse.cdt.launch" version="7.1.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.cdt.debug.mi.core" version="7.2.0" match="greaterOrEqual"/>
@@ -51,6 +47,7 @@
       <import plugin="org.eclipse.tcf.te.runtime" version="1.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.te.tcf.processes.core" version="1.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.te.tcf.core" version="1.2.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.tcf.core.feature" version="1.2.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.sdk.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.sdk.feature/feature.xml
index 3fb9e0658..0bc841ceb 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.sdk.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.sdk.feature/feature.xml
@@ -21,13 +21,10 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
    </url>
 
-   <includes
-         id="org.eclipse.tcf.te.tcf.launch.cdt.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.tcf.te.tcf.core.sdk.feature"
-         version="0.0.0"/>
+   <requires>
+      <import feature="org.eclipse.tcf.te.tcf.launch.cdt.feature" version="1.2.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.tcf.core.sdk.feature" version="1.2.0" match="greaterOrEqual"/>
+   </requires>
 
    <plugin
          id="org.eclipse.tcf.te.tcf.launch.cdt.source"
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.xml
index 698232134..13ba3563b 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.xml
@@ -21,17 +21,11 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
    </url>
 
-   <includes
-         id="org.eclipse.tcf.sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.tcf.te.tcf.core.sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.tcf.te.tcf.feature"
-         version="0.0.0"/>
+   <requires>
+      <import feature="org.eclipse.tcf.sdk.feature" version="1.2.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.tcf.core.sdk.feature" version="1.2.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.tcf.feature" version="1.2.0" match="greaterOrEqual"/>
+   </requires>
 
    <plugin
          id="org.eclipse.tcf.te.tcf.launch.core.source"
diff --git a/target_explorer/features/org.eclipse.tcf.te.terminals.sdk.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.terminals.sdk.feature/feature.xml
index 69e251ad6..59eefb254 100644
--- a/target_explorer/features/org.eclipse.tcf.te.terminals.sdk.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.terminals.sdk.feature/feature.xml
@@ -21,12 +21,9 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
    </url>
 
-   <includes
-         id="org.eclipse.tcf.te.terminals.feature"
-         version="0.0.0"/>
-
    <requires>
       <import feature="org.eclipse.tm.terminal.core.sdk" version="3.3.100" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.terminals.feature" version="1.2.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin