From 6630eac18180de4fae77b742cd8e7b31572955b4 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Thu, 2 Nov 2006 16:22:59 +0000
Subject: [PATCH] Fix remotecdt requires cdt feature

---
 .../org.eclipse.rse.remotecdt-feature/feature.xml      | 10 ++++++----
 rse/features/org.eclipse.rse.ssh-feature/feature.xml   |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml b/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml
index a274abb9f4b..60b2d2a75d2 100644
--- a/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml
@@ -27,6 +27,7 @@
    <requires>
       <import feature="org.eclipse.rse.core" version="1.0.0" match="equivalent"/>
       <import feature="org.eclipse.cdt" version="3.0.0" match="greaterOrEqual"/>
+      <!--
       <import plugin="org.eclipse.cdt.launch" version="3.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.cdt.debug.mi.core" version="3.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.cdt.debug.core" version="3.0.0" match="greaterOrEqual"/>
@@ -35,11 +36,12 @@
       <import plugin="org.eclipse.rse.subsystems.shells.core" version="1.0.0" match="equivalent"/>
       <import plugin="org.eclipse.rse.subsystems.files.core" version="1.0.0" match="equivalent"/>
       <import plugin="org.eclipse.rse.services" version="1.0.0" match="equivalent"/>
-      <import plugin="org.eclipse.debug.ui" version=""/>
+      <import plugin="org.eclipse.debug.ui"/>
       <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core" version=""/>
-      <import plugin="org.eclipse.core.resources" version=""/>
-      <import plugin="org.eclipse.core.runtime" version=""/>
+      <import plugin="org.eclipse.debug.core"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      -->
    </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 e8703afc3f4..e852cbea828 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ssh-feature/feature.xml
@@ -26,7 +26,7 @@
    <requires>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.rse.services"/>
-      <import plugin="com.jcraft.jsch" version="0.1.28"/>
+      <import plugin="com.jcraft.jsch" version="0.1.28" match="compatible"/>
       <import plugin="org.eclipse.rse.ui"/>
       <import plugin="org.eclipse.team.cvs.core" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.team.cvs.ssh2" version="3.2.0" match="compatible"/>