From 7655c5aee1cdb8337863009b9cced940020f5ea0 Mon Sep 17 00:00:00 2001
From: Uwe Stieber <uwe.stieber@windriver.com>
Date: Mon, 27 Apr 2015 09:06:31 +0200
Subject: [PATCH] Releng: Fix terminal connector dependencies

---
 .../feature.xml                                           | 6 ++----
 .../feature.xml                                           | 1 +
 .../feature.xml                                           | 6 ++++--
 .../feature.xml                                           | 8 +++++---
 .../feature.xml                                           | 8 +++++---
 .../META-INF/MANIFEST.MF                                  | 4 ++--
 .../META-INF/MANIFEST.MF                                  | 4 ++--
 .../META-INF/MANIFEST.MF                                  | 4 ++--
 .../META-INF/MANIFEST.MF                                  | 4 ++--
 .../META-INF/MANIFEST.MF                                  | 4 ++--
 10 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/features/org.eclipse.tm.terminal.connector.local.feature/feature.xml b/features/org.eclipse.tm.terminal.connector.local.feature/feature.xml
index c5a855c1e41..3b21374ac52 100644
--- a/features/org.eclipse.tm.terminal.connector.local.feature/feature.xml
+++ b/features/org.eclipse.tm.terminal.connector.local.feature/feature.xml
@@ -34,16 +34,14 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.tm.terminal.control" version="4.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.tm.terminal.control.feature" version="4.0.0" match="compatible"/>
       <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.variables" version="3.2.600" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tm.terminal.view.core" version="4.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tm.terminal.view.ui" version="4.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tm.terminal.connector.process" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tm.terminal.control" version="4.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.cdt.core.native"/>
+      <import feature="org.eclipse.tm.terminal.control.feature" version="4.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.tm.terminal.connector.remote.feature/feature.xml b/features/org.eclipse.tm.terminal.connector.remote.feature/feature.xml
index dae09f29463..12946d062ad 100644
--- a/features/org.eclipse.tm.terminal.connector.remote.feature/feature.xml
+++ b/features/org.eclipse.tm.terminal.connector.remote.feature/feature.xml
@@ -44,6 +44,7 @@
       <import plugin="org.eclipse.jface"/>
       <import plugin="org.eclipse.ui.ide"/>
       <import feature="org.eclipse.tm.terminal.control.feature" version="4.0.0" match="compatible"/>
+      <import plugin="org.eclipse.core.expressions"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.tm.terminal.connector.serial.feature/feature.xml b/features/org.eclipse.tm.terminal.connector.serial.feature/feature.xml
index 4773775e059..c58982da2bd 100644
--- a/features/org.eclipse.tm.terminal.connector.serial.feature/feature.xml
+++ b/features/org.eclipse.tm.terminal.connector.serial.feature/feature.xml
@@ -35,10 +35,12 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.tm.terminal.control" version="4.0.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.tm.terminal.control.feature" version="4.0.0" match="compatible"/>
+      <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.equinox.security" version="1.1.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.tm.terminal.connector.ssh.feature/feature.xml b/features/org.eclipse.tm.terminal.connector.ssh.feature/feature.xml
index 2cb5e43a7bd..a0b4c1176fa 100644
--- a/features/org.eclipse.tm.terminal.connector.ssh.feature/feature.xml
+++ b/features/org.eclipse.tm.terminal.connector.ssh.feature/feature.xml
@@ -36,12 +36,14 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.tm.terminal.control" version="4.0.0" match="greaterOrEqual"/>
       <import plugin="com.jcraft.jsch" version="0.1.31" match="compatible"/>
       <import plugin="org.eclipse.jsch.core" version="1.0.0" match="compatible"/>
       <import feature="org.eclipse.tm.terminal.control.feature" version="4.0.0" match="compatible"/>
-      <import plugin="org.eclipse.tm.terminal.control" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.equinox.security" version="1.1.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.tm.terminal.connector.telnet.feature/feature.xml b/features/org.eclipse.tm.terminal.connector.telnet.feature/feature.xml
index 26557e905d1..48a3f4ea022 100644
--- a/features/org.eclipse.tm.terminal.connector.telnet.feature/feature.xml
+++ b/features/org.eclipse.tm.terminal.connector.telnet.feature/feature.xml
@@ -35,10 +35,12 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import feature="org.eclipse.tm.terminal.control.feature" version="4.0.0" match="compatible"/>
       <import plugin="org.eclipse.tm.terminal.control" version="4.0.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tm.terminal.control.feature" version="4.0.0" match="compatible"/>
+      <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.equinox.security" version="1.1.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/plugins/org.eclipse.tm.terminal.connector.local/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.connector.local/META-INF/MANIFEST.MF
index a8fa633b0d4..af2779b0a41 100644
--- a/plugins/org.eclipse.tm.terminal.connector.local/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tm.terminal.connector.local/META-INF/MANIFEST.MF
@@ -12,8 +12,8 @@ Require-Bundle: org.eclipse.cdt.core;bundle-version="5.6";resolution:=optional,
  org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.core.variables;bundle-version="3.2.600",
  org.eclipse.debug.ui;bundle-version="3.8.1";resolution:=optional,
- org.eclipse.tm.terminal.view.core;bundle-version="4.0.0",
- org.eclipse.tm.terminal.view.ui;bundle-version="4.0.0",
+ org.eclipse.tm.terminal.view.core;bundle-version="4.0.0";resolution:=optional,
+ org.eclipse.tm.terminal.view.ui;bundle-version="4.0.0";resolution:=optional,
  org.eclipse.tm.terminal.connector.process;bundle-version="4.0.0",
  org.eclipse.tm.terminal.control;bundle-version="4.0.0",
  org.eclipse.ui;bundle-version="3.8.0"
diff --git a/plugins/org.eclipse.tm.terminal.connector.process/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.connector.process/META-INF/MANIFEST.MF
index 1aad9d7017b..c1860278e8c 100644
--- a/plugins/org.eclipse.tm.terminal.connector.process/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tm.terminal.connector.process/META-INF/MANIFEST.MF
@@ -11,8 +11,8 @@ Require-Bundle: org.eclipse.cdt.core;bundle-version="5.6";resolution:=optional,
  org.eclipse.core.expressions;bundle-version="3.4.400",
  org.eclipse.core.resources;bundle-version="3.8.1";resolution:=optional,
  org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.tm.terminal.view.core;bundle-version="4.0.0",
- org.eclipse.tm.terminal.view.ui;bundle-version="4.0.0",
+ org.eclipse.tm.terminal.view.core;bundle-version="4.0.0";resolution:=optional,
+ org.eclipse.tm.terminal.view.ui;bundle-version="4.0.0";resolution:=optional,
  org.eclipse.tm.terminal.control;bundle-version="4.0.0",
  org.eclipse.ui;bundle-version="3.8.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.tm.terminal.connector.serial/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.connector.serial/META-INF/MANIFEST.MF
index d69bd7f0565..c487151ad0d 100644
--- a/plugins/org.eclipse.tm.terminal.connector.serial/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tm.terminal.connector.serial/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
  org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.equinox.security;bundle-version="1.1.100",
- org.eclipse.tm.terminal.view.core;bundle-version="4.0.0",
- org.eclipse.tm.terminal.view.ui;bundle-version="4.0.0",
+ org.eclipse.tm.terminal.view.core;bundle-version="4.0.0";resolution:=optional,
+ org.eclipse.tm.terminal.view.ui;bundle-version="4.0.0";resolution:=optional,
  org.eclipse.tm.terminal.control;bundle-version="4.0.0",
  org.eclipse.ui;bundle-version="3.8.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.tm.terminal.connector.ssh/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.connector.ssh/META-INF/MANIFEST.MF
index 8f65748a019..6c6e835e13c 100644
--- a/plugins/org.eclipse.tm.terminal.connector.ssh/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tm.terminal.connector.ssh/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
  org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.equinox.security;bundle-version="1.1.100",
- org.eclipse.tm.terminal.view.core;bundle-version="4.0.0",
- org.eclipse.tm.terminal.view.ui;bundle-version="4.0.0",
+ org.eclipse.tm.terminal.view.core;bundle-version="4.0.0";resolution:=optional,
+ org.eclipse.tm.terminal.view.ui;bundle-version="4.0.0";resolution:=optional,
  org.eclipse.tm.terminal.control;bundle-version="4.0.0",
  org.eclipse.ui;bundle-version="3.8.0",
  com.jcraft.jsch;bundle-version="[0.1.31,1.0.0)",
diff --git a/plugins/org.eclipse.tm.terminal.connector.telnet/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.connector.telnet/META-INF/MANIFEST.MF
index 3e2c47390cf..0e86e43f7a4 100644
--- a/plugins/org.eclipse.tm.terminal.connector.telnet/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tm.terminal.connector.telnet/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
  org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.equinox.security;bundle-version="1.1.100",
- org.eclipse.tm.terminal.view.core;bundle-version="4.0.0",
- org.eclipse.tm.terminal.view.ui;bundle-version="4.0.0",
+ org.eclipse.tm.terminal.view.core;bundle-version="4.0.0";resolution:=optional,
+ org.eclipse.tm.terminal.view.ui;bundle-version="4.0.0";resolution:=optional,
  org.eclipse.tm.terminal.control;bundle-version="4.0.0",
  org.eclipse.ui;bundle-version="3.8.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6