[eclipse-yocto] [PATCH 2/2] Removal of RSE dependencies

[Tim Orling]

From: Scott Lewis <slewis at composent.com>

The org.yocto.sdk code currently has dependencies on the Remote System
Explorer, which in Photon is in the process of being deprecated and
removed.  This pull commit removes the RSE dependencies in:

o.y.sdk.ide/META-INF/MANIFEST.MF - Import packages removed
features/o.y.sdk and o.y.utils removed rse requires
pom.xml (top-level pom) - removed building of org.yocto.remote.utils and
org.yocto.sdk.remotetools.  These two plugin projects are no longer
needed and so they can ultimately be removed from the repo.   This
change to the top-level pom removes these two projects from the
maven-based build, but does not delete the files/directories for these
two projects.  Eventually, those two plugin projects should be removed
from repo.

Signed-off-by: Scott Lewis <slewis at composent.com>
---
 features/org.yocto.sdk/feature.xml             | 23 -----------------------
 features/org.yocto.utils/feature.xml           |  7 -------
 plugins/org.yocto.sdk.ide/META-INF/MANIFEST.MF |  5 -----
 pom.xml                                        |  6 +++++-
 4 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/features/org.yocto.sdk/feature.xml b/features/org.yocto.sdk/feature.xml
index 33185ad..a4ed4cb 100644
--- a/features/org.yocto.sdk/feature.xml
+++ b/features/org.yocto.sdk/feature.xml
@@ -41,14 +41,7 @@
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.osgi"/>
       <import plugin="org.eclipse.ui"/>
-      <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.cdt.ui" version="5.1.2" match="greaterOrEqual"/>
       <import plugin="org.eclipse.cdt.core" version="5.1.2" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources" version="3.5.1" match="greaterOrEqual"/>
@@ -58,8 +51,6 @@
       <import plugin="org.eclipse.cdt.autotools.ui" version="1.0.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.cdt.managedbuilder.ui" version="5.1.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.expressions" version="3.4.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.rse.files.ui" version="3.1.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.1.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.cdt.launch.remote" version="2.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.debug.ui"/>
       <import plugin="org.eclipse.ui.forms"/>
@@ -77,20 +68,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.yocto.remote.utils"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.yocto.sdk.remotetools"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.yocto.sdk.ide.doc.user"
          download-size="0"
diff --git a/features/org.yocto.utils/feature.xml b/features/org.yocto.utils/feature.xml
index f4e9d89..f27e0ad 100644
--- a/features/org.yocto.utils/feature.xml
+++ b/features/org.yocto.utils/feature.xml
@@ -32,11 +32,4 @@
       <import plugin="org.eclipse.core.filesystem"/>
    </requires>
 
-   <plugin
-         id="org.yocto.remote.utils"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/plugins/org.yocto.sdk.ide/META-INF/MANIFEST.MF b/plugins/org.yocto.sdk.ide/META-INF/MANIFEST.MF
index 077ba87..e76363d 100644
--- a/plugins/org.yocto.sdk.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.yocto.sdk.ide/META-INF/MANIFEST.MF
@@ -8,11 +8,6 @@ Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.cdt.managedbuilder.core,
- org.eclipse.rse.files.ui;bundle-version="3.2.200",
- org.eclipse.rse.services;bundle-version="3.2.200",
- org.eclipse.rse.core;bundle-version="3.3.100",
- org.eclipse.rse.ui;bundle-version="3.3.100",
- org.eclipse.rse.subsystems.files.core;bundle-version="3.3.1",
  org.eclipse.cdt.launch.remote;bundle-version="2.4.0",
  org.eclipse.cdt.debug.core;bundle-version="7.3.0",
  org.eclipse.cdt.debug.ui;bundle-version="7.3.0",
diff --git a/pom.xml b/pom.xml
index 8d3fc46..f1882c1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -11,6 +11,8 @@
     <properties>
 	<tycho-version>1.0.0</tycho-version>
 	<tycho-extras-version>1.0.0</tycho-extras-version>
+	<!-- to find the target platform, this must match the one of the classifiers
+	in the releng/org.yocto.sdk.releng/pom.xml -->
 	<target-platform>pokywithrse</target-platform>
 	<help-docs-eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.7</help-docs-eclipserun-repo>
 	<tycho.scmUrl>scm:git:https://github.com/crops/eclipse-poky.git</tycho.scmUrl>
@@ -45,8 +47,10 @@
 		<module>plugins/org.yocto.sdk.ide</module>
 		<module>plugins/org.yocto.sdk.ide.doc.user</module>
 		<module>plugins/org.yocto.cmake.managedbuilder</module>
+		<!-- removed since they have dependencies on RSE
 		<module>plugins/org.yocto.remote.utils</module>
 		<module>plugins/org.yocto.sdk.remotetools</module>
+		-->
 		<module>plugins/org.yocto.doc.user</module>
 		<module>features/org.yocto.sdk</module>
 		<module>features/org.yocto.utils</module>
@@ -349,7 +353,7 @@
 					<target>
 						<artifact>
 							<groupId>org.yocto.releng</groupId>
-							<artifactId>pokywithrse</artifactId>
+							<artifactId>${target-platform}</artifactId>
 							<classifier>${target-platform}</classifier>
 							<version>${project.version}</version>
 						</artifact>
-- 
2.14.3