From 78b99118e0c0c24262122fe20c2a2f11c5aae58c Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Wed, 6 Jun 2007 13:06:29 +0000
Subject: [PATCH] [189269] Add version range specifiers with all plugin
 dependencies. Make features require plugins. Avoid Discovery require RSE.

---
 .../feature.xml                               | 17 +++++++++-----
 .../META-INF/MANIFEST.MF                      |  6 ++---
 .../META-INF/MANIFEST.MF                      | 14 ++++++------
 .../org.eclipse.rse.core-feature/feature.xml  | 22 +++++++++----------
 .../feature.xml                               | 18 +++++++++++----
 .../org.eclipse.rse.ftp-feature/feature.xml   | 19 ++++++++--------
 .../org.eclipse.rse.local-feature/feature.xml | 22 +++++++------------
 .../org.eclipse.rse.ssh-feature/feature.xml   | 20 ++++++++---------
 .../feature.xml                               | 15 +++++++++----
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../META-INF/MANIFEST.MF                      | 12 +++++-----
 .../META-INF/MANIFEST.MF                      |  6 ++---
 .../META-INF/MANIFEST.MF                      | 10 ++++-----
 .../META-INF/MANIFEST.MF                      | 10 ++++-----
 .../org.eclipse.rse.core/META-INF/MANIFEST.MF |  2 +-
 .../META-INF/MANIFEST.MF                      | 20 ++++++++---------
 .../META-INF/MANIFEST.MF                      | 12 +++++-----
 .../org.eclipse.rse.efs/META-INF/MANIFEST.MF  |  8 +++----
 .../META-INF/MANIFEST.MF                      | 10 ++++-----
 .../META-INF/MANIFEST.MF                      | 10 ++++-----
 .../META-INF/MANIFEST.MF                      | 14 ++++++------
 .../META-INF/MANIFEST.MF                      |  6 ++---
 .../META-INF/MANIFEST.MF                      |  6 ++---
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../META-INF/MANIFEST.MF                      |  5 ++---
 .../META-INF/MANIFEST.MF                      | 12 +++++-----
 .../META-INF/MANIFEST.MF                      |  6 ++---
 .../META-INF/MANIFEST.MF                      | 16 +++++++-------
 .../META-INF/MANIFEST.MF                      | 10 ++++-----
 .../META-INF/MANIFEST.MF                      | 12 +++++-----
 .../META-INF/MANIFEST.MF                      | 12 +++++-----
 .../META-INF/MANIFEST.MF                      |  6 ++---
 .../META-INF/MANIFEST.MF                      | 16 +++++++-------
 .../META-INF/MANIFEST.MF                      | 12 +++++-----
 .../META-INF/MANIFEST.MF                      | 10 ++++-----
 .../META-INF/MANIFEST.MF                      |  8 +++----
 .../META-INF/MANIFEST.MF                      | 18 +++++++--------
 .../META-INF/MANIFEST.MF                      | 14 ++++++------
 .../META-INF/MANIFEST.MF                      | 14 ++++++------
 .../META-INF/MANIFEST.MF                      | 16 +++++++-------
 .../org.eclipse.rse.ui/META-INF/MANIFEST.MF   |  4 ++--
 .../org.eclipse.rse.tests-feature/feature.xml | 19 +++++++++++-----
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../META-INF/MANIFEST.MF                      | 16 +++++++-------
 45 files changed, 267 insertions(+), 246 deletions(-)

diff --git a/rse/examples/org.eclipse.rse.examples-feature/feature.xml b/rse/examples/org.eclipse.rse.examples-feature/feature.xml
index 756e05e81f2..af854b1dea9 100644
--- a/rse/examples/org.eclipse.rse.examples-feature/feature.xml
+++ b/rse/examples/org.eclipse.rse.examples-feature/feature.xml
@@ -4,8 +4,8 @@
       label="%featureName"
       version="2.0.0.qualifier"
       provider-name="%providerName"
-      image="eclipse_update_120.jpg"
-      plugin="org.eclipse.rse.examples.tutorial">
+      plugin="org.eclipse.rse.examples.tutorial"
+      image="eclipse_update_120.jpg">
 
    <description>
       %description
@@ -25,11 +25,16 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
-      <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <import feature="org.eclipse.rse.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.rse.services" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.files.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.shells.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.ui" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.files.ui" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.shells.ui" version="2.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/META-INF/MANIFEST.MF b/rse/examples/org.eclipse.rse.examples.daytime/META-INF/MANIFEST.MF
index 8fc1cf6d177..f1c073746f2 100644
--- a/rse/examples/org.eclipse.rse.examples.daytime/META-INF/MANIFEST.MF
+++ b/rse/examples/org.eclipse.rse.examples.daytime/META-INF/MANIFEST.MF
@@ -6,9 +6,9 @@ Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.examples.daytime.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.rse.ui,
- org.eclipse.rse.services,
- org.eclipse.rse.core,
+Require-Bundle: org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.ui,
  org.eclipse.ui.views,
  org.eclipse.core.runtime
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/META-INF/MANIFEST.MF b/rse/examples/org.eclipse.rse.examples.tutorial/META-INF/MANIFEST.MF
index 68b17e22e05..082321d0f1f 100644
--- a/rse/examples/org.eclipse.rse.examples.tutorial/META-INF/MANIFEST.MF
+++ b/rse/examples/org.eclipse.rse.examples.tutorial/META-INF/MANIFEST.MF
@@ -10,12 +10,12 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.views,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.eclipse.rse.ui,
- org.eclipse.rse.core,
- org.eclipse.rse.services,
- org.eclipse.rse.files.ui,
- org.eclipse.rse.shells.ui,
- org.eclipse.rse.subsystems.files.core,
- org.eclipse.rse.subsystems.shells.core
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.files.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.shells.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/features/org.eclipse.rse.core-feature/feature.xml b/rse/features/org.eclipse.rse.core-feature/feature.xml
index b7fd166cad1..e0f4f503d95 100644
--- a/rse/features/org.eclipse.rse.core-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.core-feature/feature.xml
@@ -24,21 +24,21 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.compare"/>
+      <import plugin="org.eclipse.core.filesystem"/>
       <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.debug.core"/>
+      <import plugin="org.eclipse.jface"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.search"/>
+      <import plugin="org.eclipse.swt"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.ui.editors"/>
+      <import plugin="org.eclipse.ui.forms"/>
       <import plugin="org.eclipse.ui.ide"/>
       <import plugin="org.eclipse.ui.views"/>
       <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.compare"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.forms"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.eclipse.core.filesystem"/>
    </requires>
 
    <plugin
diff --git a/rse/features/org.eclipse.rse.dstore-feature/feature.xml b/rse/features/org.eclipse.rse.dstore-feature/feature.xml
index befcd95bd6c..d81bfb7e2ae 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.dstore-feature/feature.xml
@@ -24,12 +24,22 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.ui.views"/>
-      <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
-      <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <import feature="org.eclipse.rse.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.connectorservice.dstore" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.services" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.services.dstore" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.dstore.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.dstore.extra" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.files.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.processes.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.shells.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.ui" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.files.dstore" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.processes.dstore" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.shells.dstore" version="2.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/rse/features/org.eclipse.rse.ftp-feature/feature.xml b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
index 0f7975cd7c9..53874c28c4e 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
@@ -24,17 +24,16 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
-      <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <import feature="org.eclipse.rse.core" version="2.0.0" match="compatible"/>
-      <!--
-      <import plugin="org.eclipse.rse.services"/>
-      <import plugin="org.eclipse.rse.files.ui"/>
-      <import plugin="org.eclipse.rse.subsystems.files.core"/>
-      <import plugin="org.eclipse.rse.ui"/>
-      -->
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.ui.console"/>
+      <import plugin="org.apache.oro" version="2.0.8" match="equivalent"/>
+      <import plugin="org.apache.commons.net" version="1.4.1" match="compatible"/>
+      <import plugin="org.eclipse.rse.services" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.services.files.ftp" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.files.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.ui" version="2.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/rse/features/org.eclipse.rse.local-feature/feature.xml b/rse/features/org.eclipse.rse.local-feature/feature.xml
index 9d41f0bb4aa..dd92595833a 100644
--- a/rse/features/org.eclipse.rse.local-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.local-feature/feature.xml
@@ -24,21 +24,15 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
-      <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <import feature="org.eclipse.rse.core" version="2.0.0" match="compatible"/>
-      <!--
-      <import plugin="org.eclipse.rse.services"/>
-      <import plugin="org.eclipse.rse.files.ui"/>
-      <import plugin="org.eclipse.rse.subsystems.files.core"/>
-      <import plugin="org.eclipse.rse.ui"/>
-      <import plugin="org.eclipse.rse.subsystems.processes.core"/>
-      <import plugin="org.eclipse.rse.processes.ui"/>
-      <import plugin="org.eclipse.rse.shells.ui"/>
-      <import plugin="org.eclipse.rse.subsystems.shells.core"/>
-      -->
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.rse.services" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.services.local" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.connectorservice.local" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.files.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.ui" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.processes.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.shells.core" version="2.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/rse/features/org.eclipse.rse.ssh-feature/feature.xml b/rse/features/org.eclipse.rse.ssh-feature/feature.xml
index cff3be11388..a3110f46722 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ssh-feature/feature.xml
@@ -25,18 +25,16 @@
 
    <requires>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui"/>
       <import plugin="com.jcraft.jsch" version="0.1.28" match="compatible"/>
-      <import plugin="org.eclipse.jsch.core"/>
-      <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
-      <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <!--
-      <import feature="org.eclipse.rse.core" version="2.0.0" match="compatible"/>
-      -->     
-      <import plugin="org.eclipse.rse.subsystems.files.core"/>
-      <import plugin="org.eclipse.rse.subsystems.shells.core"/>
-      <import plugin="org.eclipse.rse.services"/>
-      <import plugin="org.eclipse.rse.ui"/>
+      <import plugin="org.eclipse.jsch.core" version="1.0.0" match="compatible"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.rse.services" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.services.ssh" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.ui" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.connectorservice.ssh" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.files.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.shells.core" version="2.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/rse/features/org.eclipse.rse.telnet-feature/feature.xml b/rse/features/org.eclipse.rse.telnet-feature/feature.xml
index 54ed5994a20..10f2f982f17 100644
--- a/rse/features/org.eclipse.rse.telnet-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.telnet-feature/feature.xml
@@ -24,11 +24,18 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
-      <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <import feature="org.eclipse.rse.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.apache.commons.net" version="1.4.1" match="compatible"/>
+      <import plugin="org.apache.oro" version="2.0.8" match="equivalent"/>
+      <import plugin="org.eclipse.rse.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.connectorservice.telnet" version="1.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.services.telnet" version="1.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.services" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.shells.ui" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.shells.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.files.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.ui" version="2.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
index d5cbdb95655..9b53f6f54c7 100644
--- a/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.dstore.core.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.dstore.extra,
+ org.eclipse.dstore.extra;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.ui.views
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.dstore.core,
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF
index b84d9493eee..333b6534de8 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF
@@ -7,12 +7,12 @@ Bundle-Activator: org.eclipse.rse.internal.connectorservice.dstore.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.services,
- org.eclipse.rse.services.dstore,
- org.eclipse.dstore.core,
- org.eclipse.dstore.extra,
- org.eclipse.rse.ui,
- org.eclipse.rse.core
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.services.dstore;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.dstore.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.dstore.extra;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Export-Package: 
  org.eclipse.rse.connectorservice.dstore,
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF
index ed84800c6ba..41be16c2349 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF
@@ -7,9 +7,9 @@ Bundle-Activator: org.eclipse.rse.internal.connectorservice.local.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.services,
- org.eclipse.rse.core,
- org.eclipse.rse.ui
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.connectorservice.local;x-friends:="org.eclipse.rse.subsystems.files.local,org.eclipse.rse.subsystems.processes.local,org.eclipse.rse.subsystems.shells.local"
 Bundle-Vendor: %providerName
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.ssh/META-INF/MANIFEST.MF
index 41dc4547954..5a415baf39c 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/META-INF/MANIFEST.MF
@@ -7,13 +7,13 @@ Bundle-Activator: org.eclipse.rse.internal.connectorservice.ssh.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rse.services.ssh,
- org.eclipse.rse.services,
- org.eclipse.rse.core,
- org.eclipse.rse.ui,
+ org.eclipse.rse.services.ssh;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.ui,
  com.jcraft.jsch;bundle-version="[0.1.28,1.0.0)",
- org.eclipse.jsch.core
+ org.eclipse.jsch.core;bundle-version="[1.0.0,2.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.connectorservice.ssh;x-friends:="org.eclipse.rse.subsystems.files.ssh,org.eclipse.rse.subsystems.shells.ssh"
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.telnet/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.telnet/META-INF/MANIFEST.MF
index 56f3eac9f9e..84b205772a7 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.telnet/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.connectorservice.telnet/META-INF/MANIFEST.MF
@@ -6,12 +6,12 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.connectorservice.telnet.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rse.services.telnet,
- org.eclipse.rse.services,
- org.eclipse.rse.core,
- org.eclipse.rse.ui,
+ org.eclipse.rse.services.telnet;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.ui,
- org.apache.commons.net
+ org.apache.commons.net;bundle-version="[1.4.1,2.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.connectorservice.telnet;x-friends:="org.eclipse.rse.subsystems.shells.telnet"
 Bundle-Vendor: %providerName
diff --git a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
index 3104b3e20c9..553a016696c 100644
--- a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.rse.core.RSECorePlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.eclipse.rse.services
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.core,
  org.eclipse.rse.core.comm,
diff --git a/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF
index 486e8f10e31..be62635628b 100644
--- a/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF
@@ -7,17 +7,17 @@ Bundle-Activator: org.eclipse.rse.internal.dstore.security.UniversalSecurityPlug
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.services,
- org.eclipse.dstore.core,
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.dstore.core;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.resources,
- org.eclipse.rse.core,
- org.eclipse.rse.subsystems.files.dstore,
- org.eclipse.rse.subsystems.shells.dstore,
- org.eclipse.rse.subsystems.processes.dstore,
- org.eclipse.rse.subsystems.files.core,
- org.eclipse.rse.subsystems.processes.core,
- org.eclipse.rse.subsystems.shells.core,
- org.eclipse.rse.ui
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.files.dstore;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.shells.dstore;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.processes.dstore;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.processes.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.efs.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.efs.ui/META-INF/MANIFEST.MF
index 7b03f53c701..d50fc5c3b59 100644
--- a/rse/plugins/org.eclipse.rse.efs.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.efs.ui/META-INF/MANIFEST.MF
@@ -7,14 +7,14 @@ Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.filesystem,
- org.eclipse.rse.subsystems.files.core,
- org.eclipse.rse.services,
- org.eclipse.rse.files.ui,
- org.eclipse.rse.efs,
+ org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.files.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.efs;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.resources,
- org.eclipse.rse.ui,
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.ui.ide,
- org.eclipse.rse.core
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.efs/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.efs/META-INF/MANIFEST.MF
index c8edd9be72d..9cb241933b9 100644
--- a/rse/plugins/org.eclipse.rse.efs/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.efs/META-INF/MANIFEST.MF
@@ -7,10 +7,10 @@ Bundle-Activator: org.eclipse.rse.internal.efs.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.filesystem,
- org.eclipse.rse.core,
- org.eclipse.rse.subsystems.files.core,
- org.eclipse.rse.services,
- org.eclipse.rse.ui
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF
index bf0873384b4..b769ef38f82 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.rse.internal.files.ui.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.services,
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.resources,
  org.eclipse.ui.ide,
  org.eclipse.ui.views,
@@ -15,10 +15,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jface.text,
  org.eclipse.search,
  org.eclipse.compare,
- org.eclipse.rse.subsystems.shells.core,
- org.eclipse.rse.subsystems.files.core,
- org.eclipse.rse.ui,
- org.eclipse.rse.core
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.files.ui,
  org.eclipse.rse.files.ui.actions,
diff --git a/rse/plugins/org.eclipse.rse.importexport/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.importexport/META-INF/MANIFEST.MF
index 0d8e7544732..8f8ff654f28 100644
--- a/rse/plugins/org.eclipse.rse.importexport/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.importexport/META-INF/MANIFEST.MF
@@ -12,11 +12,11 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.ui.ide,
  org.eclipse.ui.views,
- org.eclipse.rse.services,
- org.eclipse.rse.core,
- org.eclipse.rse.ui,
- org.eclipse.rse.subsystems.files.core,
- org.eclipse.rse.files.ui
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.files.ui;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF
index 57d898fc8a1..ef3a8834120 100644
--- a/rse/plugins/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.rse.internal.processes.ui.ProcessesPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.services,
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.resources,
  org.eclipse.ui.ide,
  org.eclipse.ui.views,
@@ -16,16 +16,16 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jface.text,
  org.eclipse.search,
  org.eclipse.compare,
- org.eclipse.rse.subsystems.shells.core,
- org.eclipse.rse.subsystems.files.core,
- org.eclipse.rse.subsystems.processes.core,
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.processes.core;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.jface,
- org.eclipse.rse.services,
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.ui,
  org.eclipse.ui.views,
  org.eclipse.core.runtime,
- org.eclipse.rse.core,
- org.eclipse.rse.ui
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
 Export-Package: org.eclipse.rse.internal.processes.ui;x-internal:=true,
  org.eclipse.rse.internal.processes.ui.actions;x-internal:=true,
  org.eclipse.rse.internal.processes.ui.dialogs;x-internal:=true,
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF
index d1dee92713d..5c065ec87f6 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF
@@ -6,9 +6,9 @@ Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.services.dstore.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rse.services,
- org.eclipse.dstore.core,
- org.eclipse.dstore.extra,
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.dstore.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.dstore.extra;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.ui
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.dstore.universal.miners,
diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF
index 1eb5f7433dd..75ef3811d07 100644
--- a/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF
@@ -7,9 +7,9 @@ Bundle-Activator: org.eclipse.rse.internal.services.files.ftp.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rse.services,
- org.apache.commons.net;visibility:="reexport",
- org.eclipse.rse.core,
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.apache.commons.net;bundle-version="[1.4.1,2.0.0)";visibility:="reexport",
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.resources
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.services.files.ftp;x-friends:="org.eclipse.rse.subsystems.files.ftp",
diff --git a/rse/plugins/org.eclipse.rse.services.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.local/META-INF/MANIFEST.MF
index dd654334579..aa25fa04203 100644
--- a/rse/plugins/org.eclipse.rse.services.local/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services.local/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.rse.internal.services.local.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rse.services
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.services.local;x-friends:="org.eclipse.rse.subsystems.files.local,org.eclipse.rse.subsystems.processes.local,org.eclipse.rse.subsystems.shells.local",
  org.eclipse.rse.internal.services.local.files;x-friends:="org.eclipse.rse.subsystems.files.local",
diff --git a/rse/plugins/org.eclipse.rse.services.ssh/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.ssh/META-INF/MANIFEST.MF
index db79aa6a603..e3ae5e0b73b 100644
--- a/rse/plugins/org.eclipse.rse.services.ssh/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services.ssh/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.rse.internal.services.ssh.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rse.services,
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
  com.jcraft.jsch;bundle-version="[0.1.28,1.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.services.ssh;x-friends:="org.eclipse.rse.connectorservice.ssh,org.eclipse.rse.subsystems.files.ssh,org.eclipse.rse.subsystems.shells.ssh",
diff --git a/rse/plugins/org.eclipse.rse.services.telnet/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.telnet/META-INF/MANIFEST.MF
index 8426d837a94..584d2e614bb 100644
--- a/rse/plugins/org.eclipse.rse.services.telnet/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services.telnet/META-INF/MANIFEST.MF
@@ -7,9 +7,8 @@ Bundle-Activator: org.eclipse.rse.internal.services.telnet.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.services,
- org.apache.commons.net,
- org.eclipse.rse.services.files.ftp
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.apache.commons.net;bundle-version="[1.4.1,2.0.0)"
 Export-Package: org.eclipse.rse.internal.services.telnet;x-friends:="org.eclipse.rse.connectorservice.telnet,org.eclipse.rse.subsystems.files.telnet,org.eclipse.rse.subsystems.shells.telnet",
  org.eclipse.rse.internal.services.telnet.shell;x-friends:="org.eclipse.rse.connectorservice.telnet,org.eclipse.rse.subsystems.shells.telnet"
 Eclipse-LazyStart: true
diff --git a/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF
index 70ea58cba46..6ec43f2cac1 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.rse.internal.shells.ui.ShellsUIPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.services,
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.resources,
  org.eclipse.ui.views,
  org.eclipse.jface.text,
@@ -15,11 +15,11 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.editors,
  org.eclipse.ui.forms,
  org.eclipse.ui.ide,
- org.eclipse.rse.files.ui,
- org.eclipse.rse.subsystems.shells.core,
- org.eclipse.rse.subsystems.files.core,
- org.eclipse.rse.core,
- org.eclipse.rse.ui
+ org.eclipse.rse.files.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.shells.ui;x-internal:=true,
  org.eclipse.rse.internal.shells.ui.actions;x-internal:=true,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF
index 150bf0d9976..ed3718ba92d 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF
@@ -7,10 +7,10 @@ Bundle-Activator: org.eclipse.rse.internal.subsystems.files.core.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.services,
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.resources,
- org.eclipse.rse.core,
- org.eclipse.rse.ui
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.subsystems.files.core;x-friends:="org.eclipse.rse.subsystems.files.dstore,org.eclipse.rse.subsystems.files.local",
  org.eclipse.rse.internal.subsystems.files.core.model;x-internal:=true,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF
index a9a6c49d4ac..e8ff9ff9e17 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF
@@ -7,14 +7,14 @@ Bundle-Activator: org.eclipse.rse.internal.subsystems.files.dstore.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.services,
- org.eclipse.rse.services.dstore,
- org.eclipse.dstore.core,
- org.eclipse.rse.connectorservice.dstore,
- org.eclipse.dstore.extra,
- org.eclipse.rse.subsystems.files.core,
- org.eclipse.rse.core,
- org.eclipse.rse.ui
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.services.dstore;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.dstore.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.connectorservice.dstore;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.dstore.extra;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.subsystems.files.dstore;x-internal:=true,
  org.eclipse.rse.subsystems.files.dstore
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF
index 2c16f1d1d9e..3a6107584f3 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF
@@ -8,12 +8,12 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.services,
- org.eclipse.rse.subsystems.files.core,
- org.eclipse.rse.core,
- org.eclipse.rse.ui,
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.ui.console,
- org.eclipse.rse.services.files.ftp
+ org.eclipse.rse.services.files.ftp;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.subsystems.files.ftp;x-internal:=true,
  org.eclipse.rse.internal.subsystems.files.ftp.connectorservice;x-internal:=true,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF
index eb5338bb4cd..428ee09a596 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF
@@ -7,12 +7,12 @@ Bundle-Activator: org.eclipse.rse.internal.subsystems.files.local.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.services,
- org.eclipse.rse.services.local,
- org.eclipse.rse.connectorservice.local,
- org.eclipse.rse.subsystems.files.core,
- org.eclipse.rse.core,
- org.eclipse.rse.ui
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.services.local;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.connectorservice.local;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Export-Package: org.eclipse.rse.internal.subsystems.files.local;x-internal:=true,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/META-INF/MANIFEST.MF
index 288e3b27dcf..399dfc15a2c 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/META-INF/MANIFEST.MF
@@ -8,12 +8,12 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.services,
- org.eclipse.rse.connectorservice.ssh,
- org.eclipse.rse.services.ssh,
- org.eclipse.rse.subsystems.files.core,
- org.eclipse.rse.core,
- org.eclipse.rse.ui
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.connectorservice.ssh;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.services.ssh;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.subsystems.files.ssh;x-internal:=true,
  org.eclipse.rse.subsystems.files.ssh
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.processes.core/META-INF/MANIFEST.MF
index 0b2746ccda3..795195b22e7 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/META-INF/MANIFEST.MF
@@ -12,12 +12,12 @@ Export-Package:
  org.eclipse.rse.subsystems.processes.core.subsystem.impl,
  org.eclipse.rse.subsystems.processes.servicesubsystem
 art: true
-Require-Bundle: org.eclipse.rse.services,
+Require-Bundle: org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.runtime,
  org.eclipse.swt,
  org.eclipse.ui,
- org.eclipse.rse.core,
- org.eclipse.rse.ui
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
 Bundle-Activator: org.eclipse.rse.internal.subsystems.processes.core.Activator
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF
index a219a2e6cb2..84ff4b1ad72 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF
@@ -7,14 +7,14 @@ Bundle-Activator: org.eclipse.rse.internal.subsystems.processes.dstore.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.services,
- org.eclipse.rse.services.dstore,
- org.eclipse.dstore.core,
- org.eclipse.dstore.extra,
- org.eclipse.rse.connectorservice.dstore,
- org.eclipse.rse.subsystems.processes.core,
- org.eclipse.rse.core,
- org.eclipse.rse.ui
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.services.dstore;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.dstore.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.dstore.extra;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.connectorservice.dstore;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.processes.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF
index d2823018f75..6d9324af02b 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF
@@ -7,12 +7,12 @@ Bundle-Activator: org.eclipse.rse.internal.subsystems.processes.local.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.services,
- org.eclipse.rse.services.local,
- org.eclipse.rse.connectorservice.local,
- org.eclipse.rse.subsystems.processes.core,
- org.eclipse.rse.core,
- org.eclipse.rse.ui
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.services.local;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.connectorservice.local;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.processes.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Export-Package: org.eclipse.rse.internal.subsystems.processes.local;x-internal:=true,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux/META-INF/MANIFEST.MF
index 4ab5576c576..cc40ae569dd 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux/META-INF/MANIFEST.MF
@@ -7,11 +7,11 @@ Bundle-Activator: org.eclipse.rse.internal.subsystems.processes.shell.linux.Acti
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.ui,
- org.eclipse.rse.services,
- org.eclipse.rse.core,
- org.eclipse.rse.subsystems.processes.core,
- org.eclipse.rse.subsystems.shells.core
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.processes.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.core/META-INF/MANIFEST.MF
index 95858daf4ba..92cdf08c11b 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/META-INF/MANIFEST.MF
@@ -7,11 +7,11 @@ Bundle-Activator: org.eclipse.rse.internal.subsystems.shells.core.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.services,
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.resources,
- org.eclipse.rse.subsystems.files.core,
- org.eclipse.rse.ui,
- org.eclipse.rse.core
+ org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.subsystems.shells.core;x-internal:=true,
  org.eclipse.rse.internal.subsystems.shells.servicesubsystem;x-internal:=true,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF
index c6d81b7d90f..edc0cc3027c 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF
@@ -7,15 +7,15 @@ Bundle-Activator: org.eclipse.rse.internal.subsystems.shells.dstore.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.services,
- org.eclipse.rse.services.dstore,
- org.eclipse.dstore.core,
- org.eclipse.dstore.extra,
- org.eclipse.rse.connectorservice.dstore,
- org.eclipse.rse.subsystems.shells.core,
- org.eclipse.rse.core,
- org.eclipse.rse.ui,
- org.eclipse.rse.subsystems.files.core
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.services.dstore;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.dstore.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.dstore.extra;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.connectorservice.dstore;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Export-Package: org.eclipse.rse.internal.subsystems.shells.dstore;x-internal:=true,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF
index c1949df2bf8..219748437fb 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF
@@ -7,13 +7,13 @@ Bundle-Activator: org.eclipse.rse.internal.subsystems.shells.local.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.services,
- org.eclipse.rse.services.local,
- org.eclipse.rse.connectorservice.local,
- org.eclipse.rse.subsystems.shells.core,
- org.eclipse.rse.core,
- org.eclipse.rse.ui,
- org.eclipse.rse.subsystems.files.core
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.services.local;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.connectorservice.local;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Export-Package: org.eclipse.rse.internal.subsystems.shells.local;x-internal:=true,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF
index ecae9462a9d..7ef54ce0abb 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF
@@ -8,13 +8,13 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.services,
- org.eclipse.rse.connectorservice.ssh,
- org.eclipse.rse.services.ssh,
- org.eclipse.rse.subsystems.shells.core,
- org.eclipse.rse.subsystems.files.core,
- org.eclipse.rse.core,
- org.eclipse.rse.ui
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.connectorservice.ssh;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.services.ssh;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.subsystems.shells.ssh;x-internal:=true,
  org.eclipse.rse.subsystems.shells.ssh
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/META-INF/MANIFEST.MF
index c5d11247257..7c383b710cc 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/META-INF/MANIFEST.MF
@@ -7,14 +7,14 @@ Bundle-Activator: org.eclipse.rse.internal.subsystems.shells.telnet.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.services,
- org.eclipse.rse.connectorservice.telnet,
- org.eclipse.rse.services.telnet,
- org.eclipse.rse.subsystems.shells.core,
- org.eclipse.rse.subsystems.files.core,
- org.eclipse.rse.shells.ui,
- org.eclipse.rse.core,
- org.eclipse.rse.ui
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.connectorservice.telnet;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.rse.services.telnet;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.shells.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
 Export-Package: org.eclipse.rse.internal.subsystems.shells.telnet;x-internal:=true,
  org.eclipse.rse.subsystems.shells.telnet
 Eclipse-LazyStart: true
diff --git a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF
index 201260e5a02..49cf83435c9 100644
--- a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF
@@ -7,14 +7,14 @@ Bundle-Activator: org.eclipse.rse.ui.RSEUIPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.services,
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.resources,
  org.eclipse.jface.text,
  org.eclipse.ui.views,
  org.eclipse.ui.forms,
  org.eclipse.ui.ide,
  org.eclipse.ui.workbench.texteditor,
- org.eclipse.rse.core
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)"
 Import-Package: com.ibm.icu.lang,
  com.ibm.icu.text,
  com.ibm.icu.util
diff --git a/rse/tests/org.eclipse.rse.tests-feature/feature.xml b/rse/tests/org.eclipse.rse.tests-feature/feature.xml
index 5d0e1d20213..572e54e97f5 100644
--- a/rse/tests/org.eclipse.rse.tests-feature/feature.xml
+++ b/rse/tests/org.eclipse.rse.tests-feature/feature.xml
@@ -23,11 +23,20 @@
    </url>
 
    <requires>
-      <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
-      <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <import feature="org.eclipse.rse.core" version="2.0.0" match="equivalent"/>
-      <import feature="org.eclipse.rse.local" version="2.0.0" match="equivalent"/>
-      <import feature="org.eclipse.rse.ftp" version="2.0.0" match="equivalent"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.rse.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.ui" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.files.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.shells.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.tests.framework" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.rse.services" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.services.files.ftp" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.files.ftp" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.help"/>
       <!-- org.junit either comes with the JDT feature (org.eclipse.jdt),  -->
       <!-- or with the eclipse-test-framework download. So, don't put a    -->
       <!-- feature dependency here since it is no hard dependency          -->
diff --git a/rse/tests/org.eclipse.rse.tests.framework.examples/META-INF/MANIFEST.MF b/rse/tests/org.eclipse.rse.tests.framework.examples/META-INF/MANIFEST.MF
index caef652dd2b..7dbbb004860 100755
--- a/rse/tests/org.eclipse.rse.tests.framework.examples/META-INF/MANIFEST.MF
+++ b/rse/tests/org.eclipse.rse.tests.framework.examples/META-INF/MANIFEST.MF
@@ -6,6 +6,6 @@ Bundle-Version: 1.0.100.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.junit,
- org.eclipse.rse.tests.framework
+ org.eclipse.rse.tests.framework;bundle-version="[2.0.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Export-Package: org.eclipse.rse.tests.framework.examples
diff --git a/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF b/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF
index cbdf377eb22..bd23aa35547 100644
--- a/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF
+++ b/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF
@@ -10,15 +10,15 @@ Require-Bundle: org.junit,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.ui,
- org.eclipse.rse.core,
- org.eclipse.rse.ui,
- org.eclipse.rse.subsystems.files.core,
- org.eclipse.rse.subsystems.shells.core,
- org.eclipse.rse.tests.framework,
+ org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.tests.framework;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.ui.views,
- org.eclipse.rse.services,
- org.eclipse.rse.services.files.ftp,
- org.eclipse.rse.subsystems.files.ftp
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.services.files.ftp;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.files.ftp;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Export-Package: org.eclipse.rse.tests,