From 1a07a87aa5a5322829d0c0700b54636b03a49ca7 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Fri, 6 Jun 2008 00:58:16 +0000
Subject: [PATCH] [releng][235600] Fix services.ftp and connectorservice.ssh
 feature/bundle version inconsistencies

---
 rse/features/org.eclipse.rse.terminals-feature/feature.xml     | 2 +-
 .../org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF    | 2 +-
 .../org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF  | 2 +-
 rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF           | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/rse/features/org.eclipse.rse.terminals-feature/feature.xml b/rse/features/org.eclipse.rse.terminals-feature/feature.xml
index cd59060e3e8..de009a0fc0e 100644
--- a/rse/features/org.eclipse.rse.terminals-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.terminals-feature/feature.xml
@@ -32,7 +32,7 @@
       <import plugin="org.eclipse.rse.services.ssh" version="2.1.0" match="equivalent"/>
       <import plugin="org.eclipse.rse.core" version="3.0.0" match="compatible"/>
       <import plugin="org.eclipse.rse.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.connectorservice.ssh" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.connectorservice.ssh" version="2.1.0" match="compatible"/>
       <import plugin="org.eclipse.rse.subsystems.files.core" version="3.0.0" match="compatible"/>
       <import plugin="org.eclipse.tm.terminal" version="2.0.0" match="equivalent"/>
       <import plugin="org.eclipse.tm.terminal.view" version="2.0.0" match="equivalent"/>
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 8441d104e3a..908c8ecb738 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
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.services.files.ftp;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.services.files.ftp.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
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 9cbe846f7b0..cab6d180159 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
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.ui.console,
- org.eclipse.rse.services.files.ftp;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.rse.services.files.ftp;bundle-version="[3.0.0,4.0.0)",
  org.apache.commons.net;bundle-version="[1.4.1,2.0.0)" 
 Bundle-ActivationPolicy: lazy
 Eclipse-LazyStart: true
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 2c97b65f3e2..76ef7641c2c 100644
--- a/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF
+++ b/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF
@@ -18,7 +18,8 @@ Require-Bundle: org.junit,
  org.eclipse.rse.subsystems.processes.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.rse.subsystems.shells.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.rse.services;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.rse.services.files.ftp;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.rse.services.files.ftp;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.services.ssh;bundle-version="[2.1.0,3.0.0)",
  org.eclipse.rse.subsystems.files.ftp;bundle-version="[2.1.0,3.0.0)",
  org.eclipse.rse.files.ui,
  org.eclipse.rse.efs,