From 310127f6c6279fa154fb09768b217a20ddfdf9d5 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Fri, 10 Jul 2009 12:52:26 +0000
Subject: [PATCH] [282996] Fix feature versions for rse.terminals

---
 releng/org.eclipse.rse.updatesite/site.xml                | 8 ++++----
 rse/features/org.eclipse.rse-feature/feature.xml          | 4 ++--
 rse/features/org.eclipse.rse.sdk-feature/feature.xml      | 4 ++--
 .../org.eclipse.rse.terminals-feature/feature.xml         | 3 +--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml
index c4df4da9d8b..1ffdff70ab4 100644
--- a/releng/org.eclipse.rse.updatesite/site.xml
+++ b/releng/org.eclipse.rse.updatesite/site.xml
@@ -590,10 +590,10 @@
    <feature url="features/org.eclipse.rse.local_2.1.100.qualifier.jar" id="org.eclipse.rse.local" version="2.1.100.qualifier">
       <category name="TM and RSE 3.1.1"/>
    </feature>
-   <feature url="features/org.eclipse.rse_3.1.0.qualifier.jar" id="org.eclipse.rse" version="3.1.0.qualifier">
+   <feature url="features/org.eclipse.rse_3.1.1.qualifier.jar" id="org.eclipse.rse" version="3.1.1.qualifier">
       <category name="TM and RSE 3.1.1"/>
    </feature>
-   <feature url="features/org.eclipse.rse.sdk_3.1.0.qualifier.jar" id="org.eclipse.rse.sdk" version="3.1.0.qualifier">
+   <feature url="features/org.eclipse.rse.sdk_3.1.1.qualifier.jar" id="org.eclipse.rse.sdk" version="3.1.1.qualifier">
       <category name="TM and RSE 3.1.1"/>
    </feature>
    <feature url="features/org.eclipse.rse.ssh_3.0.0.qualifier.jar" id="org.eclipse.rse.ssh" version="3.0.0.qualifier">
@@ -605,7 +605,7 @@
    <feature url="features/org.eclipse.rse.examples_3.1.0.qualifier.jar" id="org.eclipse.rse.examples" version="3.1.0.qualifier">
       <category name="TM and RSE 3.1.1"/>
    </feature>
-   <feature url="features/org.eclipse.rse.terminals_1.0.0.qualifier.jar" id="org.eclipse.rse.terminals" version="1.0.0.qualifier">
+   <feature url="features/org.eclipse.rse.terminals_1.0.1.qualifier.jar" id="org.eclipse.rse.terminals" version="1.0.1.qualifier">
       <category name="TM and RSE 3.1.1"/>
    </feature>
    <feature url="features/org.eclipse.rse.tests_3.1.0.qualifier.jar" id="org.eclipse.rse.tests" version="3.1.0.qualifier">
@@ -620,7 +620,7 @@
    <feature url="features/org.eclipse.tm.discovery_3.0.100.qualifier.jar" id="org.eclipse.tm.discovery" version="3.0.100.qualifier">
       <category name="TM and RSE 3.1.1"/>
    </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_3.0.0.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="3.0.0.qualifier">
+   <feature url="features/org.eclipse.tm.terminal.sdk_3.0.1.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="3.0.1.qualifier">
       <category name="TM and RSE 3.1.1"/>
    </feature>
    <category-def name="TM and RSE 3.1.1" label="TM and RSE 3.1.1">
diff --git a/rse/features/org.eclipse.rse-feature/feature.xml b/rse/features/org.eclipse.rse-feature/feature.xml
index 034e1599dcd..7eb1c0269c9 100644
--- a/rse/features/org.eclipse.rse-feature/feature.xml
+++ b/rse/features/org.eclipse.rse-feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
<!--
-     Copyright (c) 2005, 2008 IBM Corporation and others.
+     Copyright (c) 2005, 2009 IBM Corporation and others.
      All rights reserved. This program and the accompanying materials
      are made available under the terms of the Eclipse Public License v1.0
      which accompanies this distribution, and is available at
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse"
       label="%featureName"
-      version="3.1.0.qualifier"
+      version="3.1.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse"
       image="eclipse_update_120.jpg">
diff --git a/rse/features/org.eclipse.rse.sdk-feature/feature.xml b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
index 6643ae7e249..fecea1c2093 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
<!--
-     Copyright (c) 2005, 2008 IBM Corporation and others.
+     Copyright (c) 2005, 2009 IBM Corporation and others.
      All rights reserved. This program and the accompanying materials
      are made available under the terms of the Eclipse Public License v1.0
      which accompanies this distribution, and is available at
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.sdk"
       label="%featureName"
-      version="3.1.0.qualifier"
+      version="3.1.1.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
diff --git a/rse/features/org.eclipse.rse.terminals-feature/feature.xml b/rse/features/org.eclipse.rse.terminals-feature/feature.xml
index 96ad85dc9e8..6daab01074b 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="1.0.0.qualifier"
+      version="1.0.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.terminals.ui"
       image="eclipse_update_120.jpg">
@@ -49,7 +49,6 @@
       <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 plugin="org.eclipse.tm.terminal" version="3.0.0" match="equivalent"/>
    </requires>
 
    <plugin