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

6 files changed, 23 insertions, 29 deletions

diff --git a/features/org.eclipse.tcf.cdt.feature/feature.xml b/features/org.eclipse.tcf.cdt.feature/feature.xml
index a089f40e9..cc5a8f92d 100644
--- a/features/org.eclipse.tcf.cdt.feature/feature.xml
+++ b/features/org.eclipse.tcf.cdt.feature/feature.xml
@@ -31,10 +31,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
    </url>
 
-   <includes
-         id="org.eclipse.tcf.feature"
-         version="0.0.0"/>
-
    <requires>
       <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources" version="3.8.1" match="greaterOrEqual"/>
@@ -54,6 +50,7 @@
       <import plugin="org.eclipse.tcf.debug.ui" version="1.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.cdt.launch" version="7.1.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.cdt.dsf.ui" version="2.3.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.feature" version="1.2.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.tcf.cdt.sdk.feature/feature.xml b/features/org.eclipse.tcf.cdt.sdk.feature/feature.xml
index 002244640..7efdebf64 100644
--- a/features/org.eclipse.tcf.cdt.sdk.feature/feature.xml
+++ b/features/org.eclipse.tcf.cdt.sdk.feature/feature.xml
@@ -31,13 +31,10 @@
       <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.cdt.feature"
-         version="0.0.0"/>
+   <requires>
+      <import feature="org.eclipse.tcf.sdk.feature" version="1.2.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.cdt.feature" version="1.2.0" match="greaterOrEqual"/>
+   </requires>
 
    <plugin
          id="org.eclipse.tcf.cdt.ui.source"
diff --git a/features/org.eclipse.tcf.core.sdk.feature/feature.xml b/features/org.eclipse.tcf.core.sdk.feature/feature.xml
index c6d152841..3f5014cae 100644
--- a/features/org.eclipse.tcf.core.sdk.feature/feature.xml
+++ b/features/org.eclipse.tcf.core.sdk.feature/feature.xml
@@ -31,9 +31,9 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
    </url>
 
-   <includes
-         id="org.eclipse.tcf.core.feature"
-         version="0.0.0"/>
+   <requires>
+      <import feature="org.eclipse.tcf.core.feature" version="1.2.0" match="greaterOrEqual"/>
+   </requires>
 
    <plugin
          id="org.eclipse.tcf.source"
diff --git a/features/org.eclipse.tcf.feature/feature.xml b/features/org.eclipse.tcf.feature/feature.xml
index ef0d1cbca..eb9a6e457 100644
--- a/features/org.eclipse.tcf.feature/feature.xml
+++ b/features/org.eclipse.tcf.feature/feature.xml
@@ -31,10 +31,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
    </url>
 
-   <includes
-         id="org.eclipse.tcf.core.feature"
-         version="0.0.0"/>
-
    <requires>
       <import plugin="org.eclipse.core.filesystem" version="1.3.200" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
@@ -57,6 +53,7 @@
       <import plugin="org.eclipse.tcf.core" version="1.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.debug" version="1.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf" version="1.2.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.core.feature" version="1.2.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.tcf.repo/category.xml b/features/org.eclipse.tcf.repo/category.xml
index 4f8a075e5..49e59c031 100644
--- a/features/org.eclipse.tcf.repo/category.xml
+++ b/features/org.eclipse.tcf.repo/category.xml
@@ -42,18 +42,24 @@
    <feature url="features/org.eclipse.tcf.te.tcf.sdk.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.tcf.sdk.feature" version="0.0.0">
       <category name="org.eclipse.tcf.te"/>
    </feature>
-   <feature url="features/org.eclipse.tcf.te.terminals.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.terminals.feature" version="0.0.0">
+   <feature url="features/org.eclipse.tcf.te.tcf.launch.cdt.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.tcf.launch.cdt.feature" version="0.0.0">
       <category name="org.eclipse.tcf.te"/>
    </feature>
-   <feature url="features/org.eclipse.tcf.te.terminals.sdk.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.terminals.sdk.feature" version="0.0.0">
+   <feature url="features/org.eclipse.tcf.te.tcf.launch.cdt.sdk.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.tcf.launch.cdt.sdk.feature" version="0.0.0">
       <category name="org.eclipse.tcf.te"/>
    </feature>
-   <feature url="features/org.eclipse.tcf.te.tcf.launch.cdt.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.tcf.launch.cdt.feature" version="0.0.0">
+   <feature url="features/org.eclipse.tcf.te.terminals.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.terminals.feature" version="0.0.0">
       <category name="org.eclipse.tcf.te"/>
    </feature>
-   <feature url="features/org.eclipse.tcf.te.tcf.launch.cdt.sdk.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.tcf.launch.cdt.sdk.feature" version="0.0.0">
+   <feature url="features/org.eclipse.tcf.te.terminals.sdk.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.terminals.sdk.feature" version="0.0.0">
       <category name="org.eclipse.tcf.te"/>
    </feature>
+   <bundle id="com.google.gson" version="2.2.4.v201311231704">
+      <category name="org.eclipse.tcf.te"/>
+   </bundle>
+   <bundle id="com.google.gson.source" version="2.2.4.v201311231704">
+      <category name="org.eclipse.tcf.te"/>
+   </bundle>
    <category-def name="org.eclipse.tcf" label="Target Communication Framework">
       <description>
          Target Communication Framework
diff --git a/features/org.eclipse.tcf.sdk.feature/feature.xml b/features/org.eclipse.tcf.sdk.feature/feature.xml
index 83edc5286..dc5cca43a 100644
--- a/features/org.eclipse.tcf.sdk.feature/feature.xml
+++ b/features/org.eclipse.tcf.sdk.feature/feature.xml
@@ -31,13 +31,10 @@
       <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.core.sdk.feature"
-         version="0.0.0"/>
+   <requires>
+      <import feature="org.eclipse.tcf.feature" version="1.2.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.core.sdk.feature" version="1.2.0" match="greaterOrEqual"/>
+   </requires>
 
    <plugin
          id="org.eclipse.tcf.debug.source"