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

8 files changed, 714 insertions, 686 deletions

diff --git a/target_explorer/features/org.eclipse.tcf.te.feature/feature.properties b/target_explorer/features/org.eclipse.tcf.te.feature/feature.properties
index be1eafe9d..66edacf72 100644
--- a/target_explorer/features/org.eclipse.tcf.te.feature/feature.properties
+++ b/target_explorer/features/org.eclipse.tcf.te.feature/feature.properties
@@ -19,6 +19,9 @@ featureName=Target Explorer
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org - TCF
 
+# "updateSiteName" property - label for the update site
+updateSiteName=Eclipse Update Site
+
 # "description" property - description of the feature
 description=The Target Explorer core framework.
 
diff --git a/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml
index 3c12e8c89..11c9d50cd 100644
--- a/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml
@@ -1,202 +1,205 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature

-      id="org.eclipse.tcf.te.feature"

-      label="%featureName"

-      version="1.1.0.qualifier"

-      provider-name="%providerName">

-

-   <description>

-      %description

-   </description>

-

-   <copyright>

-      %copyright

-   </copyright>

-

-   <license url="%licenseURL">

-      %license

-   </license>

-

-   <requires>

-      <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.core.expressions" version="3.4.300" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.cdt.core" version="5.3.1" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.debug.core" version="3.7.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.debug.ui" version="3.7.101" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.ui.forms" version="3.5.100" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.ui.navigator" version="3.5.100" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.5.200" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.help" version="3.5.100" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.debug.ui" version="3.7.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.ui.ide" version="3.8.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.equinox.security" version="1.1.0" match="greaterOrEqual"/>

-      <import feature="org.eclipse.tcf.feature" version="1.1.0.qualifier"/>

-      <import feature="org.eclipse.tm.terminal" version="3.2.0.qualifier"/>

-      <import feature="org.eclipse.tm.terminal.serial" version="2.1.100.qualifier"/>

-      <import feature="org.eclipse.tm.terminal.ssh" version="2.1.100.qualifier"/>

-      <import feature="org.eclipse.tm.terminal.telnet" version="2.1.100.qualifier"/>

-   </requires>

-

-   <plugin

-         id="org.eclipse.tcf.te.core"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.core.cdt"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.launch.core"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.launch.ui"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.runtime"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.runtime.concurrent"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.runtime.model"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.runtime.persistence"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.runtime.services"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.runtime.statushandler"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.runtime.stepper"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.ui"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.ui.controls"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.ui.forms"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.ui.startup"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.ui.swt"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.ui.terminals"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.ui.terminals.process"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.ui.terminals.serial"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.ui.terminals.ssh"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.ui.terminals.telnet"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.ui.views"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="com.google.gson"

-         download-size="0"

-         install-size="0"

-         version="2.1.0.v201203072145"

-         unpack="false"/>

-

-</feature>

+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.tcf.te.feature"
+      label="%featureName"
+      version="1.1.0.qualifier"
+      provider-name="%providerName">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <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.ui" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.ide" version="3.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.feature" version="1.1.0.qualifier" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tm.terminal" version="3.2.0.qualifier" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tm.terminal.serial" version="2.1.100.qualifier" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tm.terminal.ssh" version="2.1.100.qualifier" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tm.terminal.telnet" version="2.1.100.qualifier" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.cdt.core" version="5.4.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.ui.forms" version="3.5.200" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.navigator" version="3.5.200" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.5.300" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.help" version="3.6.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.equinox.security" version="1.1.100" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.tcf.te.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.core.cdt"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.launch.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.launch.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.runtime.concurrent"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.runtime.model"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.runtime.persistence"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.runtime.services"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.runtime.statushandler"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.runtime.stepper"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.ui.controls"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.ui.forms"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.ui.startup"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.ui.swt"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.ui.terminals"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.ui.terminals.process"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.ui.terminals.serial"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.ui.terminals.ssh"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.ui.terminals.telnet"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.ui.views"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.google.gson"
+         download-size="0"
+         install-size="0"
+         version="2.1.0.v201203072145"
+         unpack="false"/>
+
+</feature>
diff --git a/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.properties b/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.properties
index 8c449d43d..493fe6fb0 100644
--- a/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.properties
+++ b/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.properties
@@ -19,6 +19,9 @@ featureName=Target Explorer SDK
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org - TCF
 
+# "updateSiteName" property - label for the update site
+updateSiteName=Eclipse Update Site
+
 # "description" property - description of the feature
 description=The Target Explorer core framework SDK.
 
diff --git a/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.xml
index 2407d574d..6d6af9dd5 100644
--- a/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.xml
@@ -1,185 +1,189 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature

-      id="org.eclipse.tcf.te.sdk.feature"

-      label="%featureName"

-      version="1.1.0.qualifier"

-      provider-name="%providerName">

-

-   <description>

-      %description

-   </description>

-

-   <copyright>

-      %copyright

-   </copyright>

-

-   <license url="%licenseURL">

-      %license

-   </license>

-

-   <requires>

-      <import feature="org.eclipse.tcf.te.feature" version="1.1.0" match="greaterOrEqual"/>

-   </requires>

-

-   <plugin

-         id="org.eclipse.tcf.te.core.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.core.cdt.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.launch.core.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.launch.ui.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.runtime.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.runtime.concurrent.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.runtime.model.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.runtime.persistence.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.runtime.services.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.runtime.statushandler.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.runtime.stepper.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.ui.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.ui.controls.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.ui.forms.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.ui.startup.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.ui.swt.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.ui.terminals.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.ui.terminals.process.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.ui.terminals.serial.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.ui.terminals.ssh.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.ui.terminals.telnet.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.ui.views.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="com.google.gson.source"

-         download-size="0"

-         install-size="0"

-         version="2.1.0.v201203072145"

-         unpack="false"/>

-

-</feature>

+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.tcf.te.sdk.feature"
+      label="%featureName"
+      version="1.1.0.qualifier"
+      provider-name="%providerName">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="%updateSiteName" url="http://download.eclipse.org/tools/releases/juno"/>
+   </url>
+
+   <requires>
+      <import feature="org.eclipse.tcf.te.feature" version="1.1.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.tcf.te.core.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.core.cdt.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.launch.core.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.launch.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.runtime.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.runtime.concurrent.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.runtime.model.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.runtime.persistence.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.runtime.services.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.runtime.statushandler.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.runtime.stepper.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.ui.controls.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.ui.forms.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.ui.startup.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.ui.swt.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.ui.terminals.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.ui.terminals.process.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.ui.terminals.serial.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.ui.terminals.ssh.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.ui.terminals.telnet.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.ui.views.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.google.gson.source"
+         download-size="0"
+         install-size="0"
+         version="2.1.0.v201203072145"
+         unpack="false"/>
+
+</feature>
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.properties b/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.properties
index 9ccbdbfc2..6bc077f14 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.properties
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.properties
@@ -19,6 +19,9 @@ featureName=TCF Target Explorer
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org - TCF
 
+# "updateSiteName" property - label for the update site
+updateSiteName=Eclipse Update Site
+
 # "description" property - description of the feature
 description=A lightweight evolution of RSE for remote file system and process browsing, terminal access\
   and debugger launch. Supports systems running a TCF agent, extendable for other protocols.
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.xml
index acaee64b8..8caa31f2c 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.xml
@@ -1,156 +1,160 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature

-      id="org.eclipse.tcf.te.tcf.feature"

-      label="%featureName"

-      version="1.1.0.qualifier"

-      provider-name="%providerName">

-

-   <description>

-      %description

-   </description>

-

-   <copyright>

-      %copyright

-   </copyright>

-

-   <license url="%licenseURL">

-      %license

-   </license>

-

-   <requires>

-      <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.core.expressions" version="3.4.300" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.core.filesystem" version="1.3.100" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.ui.navigator" version="3.5.100" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.ui.ide" version="3.8.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.compare" version="3.5.200" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.text" version="3.5.100" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.8.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.5.200" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.debug.core" version="3.7.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.ui.forms" version="3.5.100" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.ui.console" version="3.5.100" match="greaterOrEqual"/>

-      <import feature="org.eclipse.tcf.feature" version="1.1.0" match="greaterOrEqual"/>

-      <import feature="org.eclipse.tcf.te.feature" version="1.1.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.debug.ui" version="3.7.101" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.ui.navigator" version="3.5.101" match="greaterOrEqual"/>

-   </requires>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.core"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.core.model"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.core.scripting"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.filesystem.core"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.filesystem.ui"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.launch.core"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.launch.ui"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.locator"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.log.core"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.processes.core"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.processes.ui"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.services.contexts"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.terminals.core"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.terminals.ui"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.ui"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.ui.console"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.ui.views"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-</feature>

+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.tcf.te.tcf.feature"
+      label="%featureName"
+      version="1.1.0.qualifier"
+      provider-name="%providerName">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <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.ui.ide" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.8.0" 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 feature="org.eclipse.tcf.feature" version="1.1.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.feature" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.filesystem" version="1.3.200" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.compare" version="3.5.300" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.text" version="3.5.200" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.navigator" version="3.5.200" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.5.300" 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.ui.forms" version="3.5.200" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tm.terminal" version="3.2.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.core.model"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.core.scripting"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.filesystem.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.filesystem.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.launch.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.launch.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.locator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.log.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.processes.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.processes.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.services.contexts"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.terminals.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.terminals.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.ui.console"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.ui.views"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.properties b/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.properties
index b18c4a2e7..cba5a51fa 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.properties
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.properties
@@ -19,6 +19,9 @@ featureName=TCF Target Explorer SDK
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org - TCF
 
+# "updateSiteName" property - label for the update site
+updateSiteName=Eclipse Update Site
+
 # "description" property - description of the feature
 description=The TCF Target Explorer SDK.
 
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.xml
index 282816d20..f2d194562 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.xml
@@ -1,143 +1,148 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature

-      id="org.eclipse.tcf.te.tcf.sdk.feature"

-      label="%featureName"

-      version="1.1.0.qualifier"

-      provider-name="%providerName">

-

-   <description>

-      %description

-   </description>

-

-   <copyright>

-      %copyright

-   </copyright>

-

-   <license url="%licenseURL">

-      %license

-   </license>

-

-   <requires>

-      <import feature="org.eclipse.tcf.te.sdk.feature" version="1.1.0" match="greaterOrEqual"/>

-      <import feature="org.eclipse.tcf.te.tcf.feature" version="1.1.0" match="greaterOrEqual"/>

-   </requires>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.core.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.core.model.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.core.scripting.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.filesystem.core.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.filesystem.ui.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.launch.core.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.launch.ui.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.locator.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.log.core.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.processes.core.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.processes.ui.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.services.contexts.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.terminals.core.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.terminals.ui.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.ui.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.ui.console.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.tcf.te.tcf.ui.views.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-</feature>

+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.tcf.te.tcf.sdk.feature"
+      label="%featureName"
+      version="1.1.0.qualifier"
+      provider-name="%providerName">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="%updateSiteName" url="http://download.eclipse.org/tools/releases/juno"/>
+   </url>
+
+   <requires>
+      <import feature="org.eclipse.tcf.te.sdk.feature" version="1.1.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.tcf.feature" version="1.1.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.core.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.core.model.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.core.scripting.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.filesystem.core.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.filesystem.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.launch.core.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.launch.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.locator.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.log.core.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.processes.core.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.processes.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.services.contexts.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.terminals.core.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.terminals.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.ui.console.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tcf.te.tcf.ui.views.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>