From 2cb4c2ac2a3a52d862e1da88d88e3f84cdbfe619 Mon Sep 17 00:00:00 2001
From: Uwe Stieber <uwe.stieber@windriver.com>
Date: Tue, 21 Apr 2015 10:07:34 +0200
Subject: [PATCH] Releng: Fix RSE terminal dependencies to correctly use TM
 Terminal 4.0

---
 rse/features/org.eclipse.rse.terminals-feature/feature.xml | 7 +++----
 rse/features/org.eclipse.rse.terminals.source/feature.xml  | 5 ++---
 .../org.eclipse.rse.terminals.ui/META-INF/MANIFEST.MF      | 4 ++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/rse/features/org.eclipse.rse.terminals-feature/feature.xml b/rse/features/org.eclipse.rse.terminals-feature/feature.xml
index 4fa38e51f6a..7b7da8572b7 100644
--- a/rse/features/org.eclipse.rse.terminals-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.terminals-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-     Copyright (c) 2005, 2012 IBM Corporation and others.
+     Copyright (c) 2005, 2015 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.terminals"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="3.8.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.terminals.ui"
       image="eclipse_update_120.jpg"
@@ -33,7 +33,6 @@
 
    <url>
       <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
    <requires>
@@ -46,7 +45,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.feature" version="4.0.0" match="compatible"/>
+      <import feature="org.eclipse.tm.terminal.control.feature" version="4.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/rse/features/org.eclipse.rse.terminals.source/feature.xml b/rse/features/org.eclipse.rse.terminals.source/feature.xml
index d3f778fe2c5..f5cda0e73d6 100644
--- a/rse/features/org.eclipse.rse.terminals.source/feature.xml
+++ b/rse/features/org.eclipse.rse.terminals.source/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rse.terminals.source"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="3.8.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.license"
@@ -21,8 +21,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
    </url>
 
    <plugin
diff --git a/rse/plugins/org.eclipse.rse.terminals.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.terminals.ui/META-INF/MANIFEST.MF
index 5da031aac79..4eef501cdd1 100644
--- a/rse/plugins/org.eclipse.rse.terminals.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.terminals.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.terminals.ui;singleton:=true
-Bundle-Version: 1.2.200.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.terminals.ui.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.expressions,
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.rse.ui;bundle-version="[3.1.0,4.0.0)",
  org.eclipse.rse.subsystems.terminals.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.tm.terminal;bundle-version="4.0.0"
+ org.eclipse.tm.terminal.control;bundle-version="4.0.0"
 Bundle-ActivationPolicy: lazy
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName