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

1 files changed, 2 insertions, 11 deletions

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>