[yocto] [eclipse-poky][mars][PATCH 2/3] org.yocto.sdk.site: add TM 4.0 Updates site to category.xml

[Tim Orling]

This makes it possible for the user to simply download
Eclipse for C/C++ Developers and then install the plugin,
without having to manually add any additional (e.g, rse.terminals)
update sites that would not be available in a default Eclipse
installation.

[YOCTO #9105]

Signed-off-by: Tim Orling <timothy.t.orling at linux.intel.com>
---
 features/org.yocto.sdk.site/category.xml            | 1 +
 features/org.yocto.sdk/build.properties             | 3 ++-
 features/org.yocto.sdk/feature.xml                  | 2 +-
 plugins/org.yocto.remote.utils/META-INF/MANIFEST.MF | 3 +--
 plugins/org.yocto.remote.utils/build.properties     | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/features/org.yocto.sdk.site/category.xml b/features/org.yocto.sdk.site/category.xml
index 4dd0178..dfc6b06 100644
--- a/features/org.yocto.sdk.site/category.xml
+++ b/features/org.yocto.sdk.site/category.xml
@@ -15,4 +15,5 @@
    <category-def name="Yocto Project ADT" label="Yocto Project ADT Plug-in"/>
    <category-def name="Yocto Project Bitbake Commander" label="Yocto Project Bitbake Commander Plug-in"/>
    <category-def name="Yocto Project Documentation" label="Yocto Project Documentation plug-in"/>
+   <repository-reference location="http://download.eclipse.org/tm/updates/4.0/" enabled="true" />
 </site>
diff --git a/features/org.yocto.sdk/build.properties b/features/org.yocto.sdk/build.properties
index efef74e..5d8f888 100644
--- a/features/org.yocto.sdk/build.properties
+++ b/features/org.yocto.sdk/build.properties
@@ -1,6 +1,7 @@
 bin.includes = feature.xml,\
                license.html,\
-               feature.properties
+               feature.properties, \
+               p2.inf
                
 generate.feature at org.yocto.sdk.source=org.yocto.sdk
 
diff --git a/features/org.yocto.sdk/feature.xml b/features/org.yocto.sdk/feature.xml
index 04f000d..98aa403 100644
--- a/features/org.yocto.sdk/feature.xml
+++ b/features/org.yocto.sdk/feature.xml
@@ -69,7 +69,7 @@
       <import plugin="org.eclipse.core.filesystem"/>
       <import feature="org.eclipse.rse" version="3.7.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.tm.terminal.control.feature" version="4.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.rse.terminals" version="3.7.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rse.terminals" version="3.8.0.201505221634" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/plugins/org.yocto.remote.utils/META-INF/MANIFEST.MF b/plugins/org.yocto.remote.utils/META-INF/MANIFEST.MF
index 250d5d6..1bea6dd 100644
--- a/plugins/org.yocto.remote.utils/META-INF/MANIFEST.MF
+++ b/plugins/org.yocto.remote.utils/META-INF/MANIFEST.MF
@@ -9,8 +9,7 @@ Require-Bundle: org.eclipse.ui,
  org.yocto.sdk.ide;bundle-version="1.4.1",
  org.eclipse.rse.core;bundle-version="3.3.100",
  org.eclipse.rse.subsystems.terminals.core;bundle-version="1.0.300";visibility:=reexport,
- org.eclipse.rse.ui,
- org.eclipse.rse.terminals.ui;bundle-version="1.3.0";visibility:=reexport
+ org.eclipse.rse.ui
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: org.eclipse.core.internal.filesystem,
diff --git a/plugins/org.yocto.remote.utils/build.properties b/plugins/org.yocto.remote.utils/build.properties
index c3d44a1..990eb12 100644
--- a/plugins/org.yocto.remote.utils/build.properties
+++ b/plugins/org.yocto.remote.utils/build.properties
@@ -1,5 +1,5 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-				resources/,\
+               resources/,\
                .
-- 
2.7.4