Terminal: Switch to TM Terminal 4.0

6 files changed, 15 insertions, 30 deletions

diff --git a/features/org.eclipse.tcf.cdt.feature/feature.xml b/features/org.eclipse.tcf.cdt.feature/feature.xml
index a37ba0e20..84974165a 100644
--- a/features/org.eclipse.tcf.cdt.feature/feature.xml
+++ b/features/org.eclipse.tcf.cdt.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.tcf.cdt.feature"
       label="%featureName"
-      version="1.3.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -40,19 +40,21 @@
       <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.debug.core" version="3.7.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.debug.ui" version="3.8.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jface.text" version="3.8.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
-      <import feature="org.eclipse.cdt" version="8.1.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.cdt.core" version="5.4.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.cdt.ui" version="5.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.cdt.debug.core" version="7.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.cdt.debug.ui" version="7.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.core" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.debug" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.debug.ui" version="1.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jface.text" version="3.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.expressions" version="3.4.400" 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.cdt" version="8.1.1" match="greaterOrEqual"/>
       <import feature="org.eclipse.tcf.feature" version="1.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.debug.ui" version="1.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.editors"/>
+      <import plugin="org.eclipse.ui.workbench"/>
    </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 39ac6dc58..22fbacc69 100644
--- a/features/org.eclipse.tcf.cdt.sdk.feature/feature.xml
+++ b/features/org.eclipse.tcf.cdt.sdk.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.tcf.cdt.sdk.feature"
       label="%featureName"
-      version="1.3.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -34,8 +34,8 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.tcf.sdk.feature" version="1.3.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.tcf.cdt.feature" version="1.3.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.sdk.feature" version="1.3.1" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.cdt.feature" version="1.3.1" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.tcf.feature/feature.xml b/features/org.eclipse.tcf.feature/feature.xml
index ec6109c5a..282080914 100644
--- a/features/org.eclipse.tcf.feature/feature.xml
+++ b/features/org.eclipse.tcf.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.tcf.feature"
       label="%featureName"
-      version="1.3.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -51,7 +51,7 @@
       <import plugin="org.eclipse.ui.ide" version="3.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.views" version="3.6.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.workbench.texteditor" version="3.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tm.terminal" version="3.2.2" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tm.terminal.control" version="4.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.core" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.debug" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf" version="1.3.0" match="greaterOrEqual"/>
diff --git a/features/org.eclipse.tcf.repo/category.xml b/features/org.eclipse.tcf.repo/category.xml
index 01ed91887..9af8d1a1f 100644
--- a/features/org.eclipse.tcf.repo/category.xml
+++ b/features/org.eclipse.tcf.repo/category.xml
@@ -54,18 +54,6 @@
    <feature url="features/org.eclipse.tcf.te.tcf.remote.sdk.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.tcf.remote.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">
-      <category name="org.eclipse.tcf.te.terminals"/>
-   </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">
-      <category name="org.eclipse.tcf.te.terminals"/>
-   </feature>
-   <feature url="features/org.eclipse.tcf.te.terminals.rse.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.terminals.rse.feature" version="0.0.0">
-      <category name="org.eclipse.tcf.te.terminals"/>
-   </feature>
-   <feature url="features/org.eclipse.tcf.te.terminals.rse.sdk.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.terminals.rse.sdk.feature" version="0.0.0">
-      <category name="org.eclipse.tcf.te.terminals"/>
-   </feature>
    <bundle id="com.google.gson" version="2.2.4.v201311231704">
       <category name="org.eclipse.tcf.te"/>
    </bundle>
@@ -82,9 +70,4 @@
          Target Explorer
       </description>
    </category-def>
-   <category-def name="org.eclipse.tcf.te.terminals" label="TCF Terminals">
-      <description>
-         Terminals
-      </description>
-   </category-def>
 </site>
diff --git a/features/org.eclipse.tcf.repo/pom.xml b/features/org.eclipse.tcf.repo/pom.xml
index 42c68c287..2c8a22df4 100644
--- a/features/org.eclipse.tcf.repo/pom.xml
+++ b/features/org.eclipse.tcf.repo/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath>../../admin/pom-build.xml</relativePath>
 	</parent>
 
-	<version>1.3.0-SNAPSHOT</version>
+	<version>1.3.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.tcf.repo</artifactId>
 	<packaging>eclipse-repository</packaging>
 
diff --git a/features/org.eclipse.tcf.sdk.feature/feature.xml b/features/org.eclipse.tcf.sdk.feature/feature.xml
index de97c40e8..79ce33d34 100644
--- a/features/org.eclipse.tcf.sdk.feature/feature.xml
+++ b/features/org.eclipse.tcf.sdk.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.tcf.sdk.feature"
       label="%featureName"
-      version="1.3.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="%featureProvider"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -34,7 +34,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.tcf.feature" version="1.3.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.feature" version="1.3.1" match="greaterOrEqual"/>
       <import feature="org.eclipse.tcf.core.sdk.feature" version="1.3.0" match="greaterOrEqual"/>
    </requires>