Releng: Synchronize plugin/feature dependencies with Juno target platform, Fix update site URL in all features

10 files changed, 50 insertions, 54 deletions

diff --git a/features/org.eclipse.tcf.cdt.feature/feature.properties b/features/org.eclipse.tcf.cdt.feature/feature.properties
index a48c8169c..059e5caea 100644
--- a/features/org.eclipse.tcf.cdt.feature/feature.properties
+++ b/features/org.eclipse.tcf.cdt.feature/feature.properties
@@ -16,7 +16,7 @@ featureName=TCF C/C++ Debugger
 providerName=Eclipse CDT
 
 # "updateSiteName" property - label for the update site
-updateSiteName=TCF Update Site
+updateSiteName=Eclipse Update Site
 
 # "description" property - description of the feature
 description=A full-featured C/C++ debugger for local or remote systems running a TCF agent.\
diff --git a/features/org.eclipse.tcf.cdt.feature/feature.xml b/features/org.eclipse.tcf.cdt.feature/feature.xml
index f0178ecd9..584c254e8 100644
--- a/features/org.eclipse.tcf.cdt.feature/feature.xml
+++ b/features/org.eclipse.tcf.cdt.feature/feature.xml
@@ -28,7 +28,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/juno"/>
+      <update label="%updateSiteName" url="http://download.eclipse.org/tools/releases/juno"/>
    </url>
 
    <includes
@@ -36,23 +36,16 @@
          version="0.0.0"/>
 
    <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.cdt.ui"/>
-      <import plugin="org.eclipse.cdt.debug.core"/>
-      <import plugin="org.eclipse.core.expressions"/>
       <import feature="org.eclipse.cdt" version="8.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.text" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.debug.ui"/>
-      <import plugin="org.eclipse.tcf.core"/>
-      <import plugin="org.eclipse.tcf.debug"/>
-      <import plugin="org.eclipse.tcf.debug.ui"/>
-      <import plugin="org.eclipse.jface.text" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.launch" version="7.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.resources" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.text" version="3.5.200" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.debug.core" version="3.7.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.debug.ui" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jface.text" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.feature" version="1.1.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.tcf.cdt.sdk.feature/feature.properties b/features/org.eclipse.tcf.cdt.sdk.feature/feature.properties
index 99d45901c..3b89a4a94 100644
--- a/features/org.eclipse.tcf.cdt.sdk.feature/feature.properties
+++ b/features/org.eclipse.tcf.cdt.sdk.feature/feature.properties
@@ -16,7 +16,7 @@ featureName=TCF C/C++ Debugger SDK
 providerName=Eclipse CDT
 
 # "updateSiteName" property - label for the update site
-updateSiteName=TCF Update Site
+updateSiteName=Eclipse Update Site
 
 # "description" property - description of the feature
 description=A full-featured C/C++ debugger for local or remote systems running a TCF agent.\
diff --git a/features/org.eclipse.tcf.cdt.sdk.feature/feature.xml b/features/org.eclipse.tcf.cdt.sdk.feature/feature.xml
index aff51a9c5..dec61bdb5 100644
--- a/features/org.eclipse.tcf.cdt.sdk.feature/feature.xml
+++ b/features/org.eclipse.tcf.cdt.sdk.feature/feature.xml
@@ -28,7 +28,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/juno"/>
+      <update label="%updateSiteName" url="http://download.eclipse.org/tools/releases/juno"/>
    </url>
 
    <requires>
diff --git a/features/org.eclipse.tcf.feature/feature.properties b/features/org.eclipse.tcf.feature/feature.properties
index 98844aca0..ba2b0191e 100644
--- a/features/org.eclipse.tcf.feature/feature.properties
+++ b/features/org.eclipse.tcf.feature/feature.properties
@@ -16,7 +16,7 @@ featureName=Target Communication Framework
 providerName=Eclipse CDT
 
 # "updateSiteName" property - label for the update site
-updateSiteName=TCF Update Site
+updateSiteName=Eclipse Update Site
 
 # "description" property - description of the feature
 description=\
diff --git a/features/org.eclipse.tcf.feature/feature.xml b/features/org.eclipse.tcf.feature/feature.xml
index 4136bf1f3..cf02d9fcf 100644
--- a/features/org.eclipse.tcf.feature/feature.xml
+++ b/features/org.eclipse.tcf.feature/feature.xml
@@ -28,26 +28,29 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/juno"/>
+      <update label="%updateSiteName" url="http://download.eclipse.org/tools/releases/juno"/>
    </url>
 
    <requires>
+      <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.filesystem" version="1.3.200" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.resources" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.debug.core" version="3.7.100" match="greaterOrEqual"/>
+      <import plugin="com.jcraft.jsch" version="0.1.46" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.debug.ui" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jface.text" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jsch.core" version="1.1.400" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jsch.ui" version="1.1.400" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.text" version="3.5.200" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.console" version="3.5.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.editors" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.ide" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.views" version="3.6.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.debug" version="1.1.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.console"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.text"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="com.jcraft.jsch" version="0.1.37" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jsch.core" version="1.1.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jsch.ui" version="1.1.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.expressions"/>
-      <import plugin="org.eclipse.core.filesystem" version="1.3.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.tcf.rse.feature/feature.properties b/features/org.eclipse.tcf.rse.feature/feature.properties
index 0b3d8b98a..bed6d532d 100644
--- a/features/org.eclipse.tcf.rse.feature/feature.properties
+++ b/features/org.eclipse.tcf.rse.feature/feature.properties
@@ -16,7 +16,7 @@ featureName=TCF Remote System Explorer add-in
 providerName=Eclipse CDT
 
 # "updateSiteName" property - label for the update site
-updateSiteName=TCF Update Site
+updateSiteName=Eclipse Update Site
 
 # "description" property - description of the feature
 description=Remote file system and process browsing, and shell access in RSE for systems running a TCF agent.\
diff --git a/features/org.eclipse.tcf.rse.feature/feature.xml b/features/org.eclipse.tcf.rse.feature/feature.xml
index 4456295ff..663adb561 100644
--- a/features/org.eclipse.tcf.rse.feature/feature.xml
+++ b/features/org.eclipse.tcf.rse.feature/feature.xml
@@ -28,7 +28,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/juno"/>
+      <update label="%updateSiteName" url="http://download.eclipse.org/tools/releases/juno"/>
    </url>
 
    <includes
@@ -36,21 +36,21 @@
          version="0.0.0"/>
 
    <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import feature="org.eclipse.rse" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.rse.core"/>
-      <import plugin="org.eclipse.rse.ui"/>
-      <import plugin="org.eclipse.rse.services"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.rse.subsystems.files.core"/>
-      <import plugin="org.eclipse.rse.subsystems.processes.core"/>
-      <import plugin="org.eclipse.rse.processes.ui"/>
-      <import plugin="org.eclipse.rse.subsystems.terminals.core"/>
+      <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.resources" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.rse.core" version="3.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.rse.processes.ui" version="3.0.400" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.rse.services" version="3.2.200" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.rse.subsystems.files.core" version="3.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.rse.subsystems.processes.core" version="3.1.300" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.rse.subsystems.terminals.core" version="1.0.300" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.1.300" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.rse.ui" version="3.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.1.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.resources" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.core" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.views" version="3.6.100" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rse" version="3.4.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.tcf.rse.sdk.feature/feature.properties b/features/org.eclipse.tcf.rse.sdk.feature/feature.properties
index 4b1ee5b05..35f543807 100644
--- a/features/org.eclipse.tcf.rse.sdk.feature/feature.properties
+++ b/features/org.eclipse.tcf.rse.sdk.feature/feature.properties
@@ -16,7 +16,7 @@ featureName=TCF Remote System Explorer add-in SDK
 providerName=Eclipse CDT
 
 # "updateSiteName" property - label for the update site
-updateSiteName=TCF Update Site
+updateSiteName=Eclipse Update Site
 
 # "description" property - description of the feature
 description=Remote file system and process browsing, and shell access in RSE for systems running a TCF agent.\
diff --git a/features/org.eclipse.tcf.rse.sdk.feature/feature.xml b/features/org.eclipse.tcf.rse.sdk.feature/feature.xml
index 3a3f39acb..607825033 100644
--- a/features/org.eclipse.tcf.rse.sdk.feature/feature.xml
+++ b/features/org.eclipse.tcf.rse.sdk.feature/feature.xml
@@ -28,7 +28,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/juno"/>
+      <update label="%updateSiteName" url="http://download.eclipse.org/tools/releases/juno"/>
    </url>
 
    <requires>