From dfe1ef4d5a159571e8510abe7d98966c146328e7 Mon Sep 17 00:00:00 2001
From: Uwe Stieber <uwe.stieber@windriver.com>
Date: Mon, 13 Oct 2014 07:08:44 +0200
Subject: [PATCH] RSE Terminal feature must require the TM Terminal feature
 instead of including it

---
 .../org.eclipse.rse.terminals-feature/feature.xml         | 8 ++------
 rse/features/org.eclipse.rse.terminals-feature/pom.xml    | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/rse/features/org.eclipse.rse.terminals-feature/feature.xml b/rse/features/org.eclipse.rse.terminals-feature/feature.xml
index f4b6a89ec88..6b8db3f1dfa 100644
--- a/rse/features/org.eclipse.rse.terminals-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.terminals-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.terminals"
       label="%featureName"
-      version="3.6.1.qualifier"
+      version="3.6.100.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.terminals.ui"
       image="eclipse_update_120.jpg"
@@ -36,11 +36,6 @@
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
    </url>
 
-   <includes
-         id="org.eclipse.tm.terminal"
-         version="0.0.0"
-         search-location="self"/>
-
    <requires>
       <import plugin="org.eclipse.core.expressions"/>
       <import plugin="org.eclipse.core.runtime"/>
@@ -51,6 +46,7 @@
       <import plugin="org.eclipse.rse.core" version="3.0.0" match="compatible"/>
       <import plugin="org.eclipse.rse.ui" version="3.1.0" match="compatible"/>
       <import plugin="org.eclipse.rse.connectorservice.ssh" version="2.1.0" match="compatible"/>
+      <import feature="org.eclipse.tm.terminal" version="3.2.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/rse/features/org.eclipse.rse.terminals-feature/pom.xml b/rse/features/org.eclipse.rse.terminals-feature/pom.xml
index 8ee3b306cc5..2027fea7680 100644
--- a/rse/features/org.eclipse.rse.terminals-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.terminals-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.terminals</artifactId>
-  <version>3.6.1-SNAPSHOT</version>
+  <version>3.6.100-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <build>