From a59238ffebfdfd7da81cfd8b144157c803e4a357 Mon Sep 17 00:00:00 2001
From: Greg Watson <g.watson@computer.org>
Date: Fri, 11 Mar 2016 09:58:16 -0500
Subject: [PATCH] Bug 488338 - Change to using import-package

Change-Id: I9c78e4488c7ff93f70403fd005e6443ceaa163be
Signed-off-by: Greg Watson <g.watson@computer.org>
---
 .../META-INF/MANIFEST.MF                      | 32 ++++++++++---
 .../META-INF/MANIFEST.MF                      | 20 +++++----
 .../META-INF/MANIFEST.MF                      | 12 +++--
 .../html/.gitignore                           |  1 +
 .../META-INF/MANIFEST.MF                      | 16 ++++---
 .../META-INF/MANIFEST.MF                      | 42 ++++++++++++-----
 .../META-INF/MANIFEST.MF                      |  8 ++--
 .../META-INF/MANIFEST.MF                      | 26 ++++++++---
 .../META-INF/MANIFEST.MF                      |  8 +++-
 .../META-INF/MANIFEST.MF                      | 24 +++++++---
 .../META-INF/MANIFEST.MF                      | 44 +++++++++++++-----
 .../org.eclipse.remote-feature/feature.xml    | 14 ------
 releng/org.eclipse.remote.build/pom.xml       | 26 +++++++++--
 releng/org.eclipse.remote.target/.project     | 11 +++++
 .../mars.target                               |  5 ++-
 releng/org.eclipse.remote.target/pom.xml      | 45 +++++++++++++++++++
 16 files changed, 253 insertions(+), 81 deletions(-)
 create mode 100644 bundles/org.eclipse.remote.doc.isv/html/.gitignore
 create mode 100644 releng/org.eclipse.remote.target/.project
 rename releng/{org.eclipse.remote.build => org.eclipse.remote.target}/mars.target (92%)
 create mode 100644 releng/org.eclipse.remote.target/pom.xml

diff --git a/bundles/org.eclipse.remote.console/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.console/META-INF/MANIFEST.MF
index ab43da1de05..07fd923b4ba 100644
--- a/bundles/org.eclipse.remote.console/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.remote.console/META-INF/MANIFEST.MF
@@ -5,13 +5,33 @@ Bundle-SymbolicName: org.eclipse.remote.console;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.remote.internal.console.Activator
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.remote.core;bundle-version="2.0.0",
- org.eclipse.remote.ui;bundle-version="2.0.0",
- org.eclipse.ui.console;bundle-version="3.6.0",
- org.eclipse.tm.terminal.control;bundle-version="4.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %pluginProvider
 Export-Package: org.eclipse.remote.console
+Import-Package: org.eclipse.core.commands,
+ org.eclipse.core.runtime,
+ org.eclipse.core.runtime.jobs,
+ org.eclipse.jface.action,
+ org.eclipse.jface.dialogs,
+ org.eclipse.jface.resource,
+ org.eclipse.jface.viewers,
+ org.eclipse.jface.window,
+ org.eclipse.osgi.util,
+ org.eclipse.remote.core,
+ org.eclipse.remote.core.exception,
+ org.eclipse.remote.ui.widgets,
+ org.eclipse.swt,
+ org.eclipse.swt.events,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.widgets,
+ org.eclipse.tm.internal.terminal.control,
+ org.eclipse.tm.internal.terminal.provisional.api,
+ org.eclipse.ui,
+ org.eclipse.ui.console,
+ org.eclipse.ui.console.actions,
+ org.eclipse.ui.handlers,
+ org.eclipse.ui.part,
+ org.eclipse.ui.plugin,
+ org.eclipse.ui.progress,
+ org.osgi.framework
diff --git a/bundles/org.eclipse.remote.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.core/META-INF/MANIFEST.MF
index 1fff97f30ca..6938a2c48ff 100644
--- a/bundles/org.eclipse.remote.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.remote.core/META-INF/MANIFEST.MF
@@ -5,11 +5,6 @@ Bundle-SymbolicName: org.eclipse.remote.core;singleton:=true
 Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.remote.internal.core.RemoteCorePlugin
 Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.core.filesystem,
- org.eclipse.core.resources,
- org.eclipse.core.variables,
- org.eclipse.debug.core
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.remote.core,
  org.eclipse.remote.core.exception,
@@ -18,6 +13,15 @@ Export-Package: org.eclipse.remote.core,
  org.eclipse.remote.internal.core.preferences;x-friends:="org.eclipse.remote.ui"
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Import-Package: org.eclipse.equinox.security.storage,
- org.eclipse.cdt.utils.pty,
- org.eclipse.cdt.utils.spawner
+Import-Package: org.eclipse.cdt.utils.pty,
+ org.eclipse.cdt.utils.spawner,
+ org.eclipse.core.filesystem,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.core.runtime.preferences,
+ org.eclipse.debug.core,
+ org.eclipse.equinox.security.storage,
+ org.eclipse.osgi.service.debug,
+ org.eclipse.osgi.util,
+ org.osgi.framework,
+ org.osgi.service.prefs
diff --git a/bundles/org.eclipse.remote.doc.isv/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.doc.isv/META-INF/MANIFEST.MF
index 205562d3eea..176f91b8cf6 100644
--- a/bundles/org.eclipse.remote.doc.isv/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.remote.doc.isv/META-INF/MANIFEST.MF
@@ -3,7 +3,13 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse Remote Development documentation plug-in
 Bundle-SymbolicName: org.eclipse.remote.doc.isv;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.eclipse.remote.console;bundle-version="1.0.0",
- org.eclipse.remote.core;bundle-version="2.0.0",
- org.eclipse.remote.ui;bundle-version="2.0.0"
 Bundle-Vendor: Eclipse PTP
+Require-Bundle: org.eclipse.remote.console,
+ org.eclipse.remote.core,
+ org.eclipse.remote.jsch.core,
+ org.eclipse.remote.jsch.ui,
+ org.eclipse.remote.serial.core,
+ org.eclipse.remote.serial.ui,
+ org.eclipse.remote.telnet.core,
+ org.eclipse.remote.telnet.ui,
+ org.eclipse.remote.ui
diff --git a/bundles/org.eclipse.remote.doc.isv/html/.gitignore b/bundles/org.eclipse.remote.doc.isv/html/.gitignore
new file mode 100644
index 00000000000..07f43314f62
--- /dev/null
+++ b/bundles/org.eclipse.remote.doc.isv/html/.gitignore
@@ -0,0 +1 @@
+/reference/
diff --git a/bundles/org.eclipse.remote.jsch.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.jsch.core/META-INF/MANIFEST.MF
index 76c3b226e47..95d78a01ebf 100644
--- a/bundles/org.eclipse.remote.jsch.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.remote.jsch.core/META-INF/MANIFEST.MF
@@ -5,14 +5,18 @@ Bundle-SymbolicName: org.eclipse.remote.jsch.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.remote.internal.jsch.core.Activator
 Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.core.filesystem,
- org.eclipse.remote.core;bundle-version="2.0",
- org.eclipse.jsch.core,
- com.jcraft.jsch,
- org.eclipse.equinox.security
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.remote.internal.jsch.core;x-friends:="org.eclipse.remote.jsch.ui,org.eclipse.remote.jsch.tests",
  org.eclipse.remote.internal.jsch.core.messages;x-internal:=true
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Import-Package: com.jcraft.jsch,
+ org.eclipse.core.filesystem,
+ org.eclipse.core.filesystem.provider,
+ org.eclipse.core.runtime,
+ org.eclipse.jsch.core,
+ org.eclipse.osgi.util,
+ org.eclipse.remote.core,
+ org.eclipse.remote.core.exception,
+ org.eclipse.remote.internal.core,
+ org.osgi.framework
diff --git a/bundles/org.eclipse.remote.jsch.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.jsch.ui/META-INF/MANIFEST.MF
index 00c083ceeb3..1c1152219ec 100644
--- a/bundles/org.eclipse.remote.jsch.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.remote.jsch.ui/META-INF/MANIFEST.MF
@@ -5,20 +5,38 @@ Bundle-SymbolicName: org.eclipse.remote.jsch.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.remote.internal.jsch.ui.Activator
 Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.core.filesystem,
- org.eclipse.remote.core;bundle-version="2.0",
- org.eclipse.remote.ui,
- org.eclipse.remote.jsch.core,
- org.eclipse.jsch.core,
- org.eclipse.jsch.ui,
- com.jcraft.jsch,
- org.eclipse.ui.forms,
- org.eclipse.ui.ide,
- org.eclipse.ui,
- org.eclipse.jface
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.remote.internal.jsch.ui;x-internal:=true,
  org.eclipse.remote.internal.jsch.ui.messages;x-internal:=true
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Import-Package: com.jcraft.jsch,
+ org.eclipse.core.filesystem,
+ org.eclipse.core.runtime,
+ org.eclipse.jface.dialogs,
+ org.eclipse.jface.operation,
+ org.eclipse.jface.preference,
+ org.eclipse.jface.resource,
+ org.eclipse.jface.viewers,
+ org.eclipse.jface.window,
+ org.eclipse.jface.wizard,
+ org.eclipse.jsch.core,
+ org.eclipse.jsch.ui,
+ org.eclipse.osgi.util,
+ org.eclipse.remote.core,
+ org.eclipse.remote.core.exception,
+ org.eclipse.remote.internal.jsch.core,
+ org.eclipse.remote.ui,
+ org.eclipse.remote.ui.dialogs,
+ org.eclipse.remote.ui.widgets,
+ org.eclipse.swt,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.widgets,
+ org.eclipse.ui.dialogs,
+ org.eclipse.ui.forms.events,
+ org.eclipse.ui.forms.widgets,
+ org.eclipse.ui.ide.fileSystem,
+ org.eclipse.ui.plugin,
+ org.osgi.framework
diff --git a/bundles/org.eclipse.remote.serial.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.serial.core/META-INF/MANIFEST.MF
index b1ffaa0b9ba..302b788dab3 100644
--- a/bundles/org.eclipse.remote.serial.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.remote.serial.core/META-INF/MANIFEST.MF
@@ -5,10 +5,12 @@ Bundle-SymbolicName: org.eclipse.remote.serial.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.remote.serial.internal.core.Activator
 Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.remote.core;bundle-version="2.0.0",
- org.eclipse.cdt.native.serial
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.remote.serial.core
 Bundle-Localization: plugin
+Import-Package: org.eclipse.cdt.serial,
+ org.eclipse.core.runtime,
+ org.eclipse.osgi.util,
+ org.eclipse.remote.core,
+ org.osgi.framework
diff --git a/bundles/org.eclipse.remote.serial.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.serial.ui/META-INF/MANIFEST.MF
index 4a3d04261c0..c34fe7e1aab 100644
--- a/bundles/org.eclipse.remote.serial.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.remote.serial.ui/META-INF/MANIFEST.MF
@@ -4,14 +4,28 @@ Bundle-Name: %bundleName
 Bundle-SymbolicName: org.eclipse.remote.serial.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.remote.serial.internal.ui.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.remote.core;bundle-version="2.0.0",
- org.eclipse.remote.ui;bundle-version="2.0.0",
- org.eclipse.cdt.native.serial;bundle-version="1.0.0",
- org.eclipse.remote.serial.core;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.remote.serial.ui
+Import-Package: org.eclipse.cdt.serial,
+ org.eclipse.core.runtime,
+ org.eclipse.jface.dialogs,
+ org.eclipse.jface.operation,
+ org.eclipse.jface.resource,
+ org.eclipse.jface.viewers,
+ org.eclipse.jface.window,
+ org.eclipse.jface.wizard,
+ org.eclipse.osgi.util,
+ org.eclipse.remote.core,
+ org.eclipse.remote.core.exception,
+ org.eclipse.remote.serial.core,
+ org.eclipse.remote.ui,
+ org.eclipse.swt,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.widgets,
+ org.eclipse.ui.plugin,
+ org.osgi.framework
diff --git a/bundles/org.eclipse.remote.telnet.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.telnet.core/META-INF/MANIFEST.MF
index ff5aae30848..358a6772519 100644
--- a/bundles/org.eclipse.remote.telnet.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.remote.telnet.core/META-INF/MANIFEST.MF
@@ -5,10 +5,14 @@ Bundle-SymbolicName: org.eclipse.remote.telnet.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.remote.telnet.internal.core.Activator
 Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.remote.core;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.remote.telnet.core,
  org.eclipse.remote.telnet.internal.core;x-internal:=true
 Bundle-Localization: plugin
+Import-Package: org.eclipse.core.runtime,
+ org.eclipse.osgi.service.debug;version="1.2.0",
+ org.eclipse.osgi.util,
+ org.eclipse.remote.core,
+ org.eclipse.remote.core.exception,
+ org.osgi.framework
diff --git a/bundles/org.eclipse.remote.telnet.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.telnet.ui/META-INF/MANIFEST.MF
index 81020daa071..fe35a4479fa 100644
--- a/bundles/org.eclipse.remote.telnet.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.remote.telnet.ui/META-INF/MANIFEST.MF
@@ -4,12 +4,26 @@ Bundle-Name: %bundleName
 Bundle-SymbolicName: org.eclipse.remote.telnet.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.remote.telnet.internal.ui.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.remote.core;bundle-version="2.0.0",
- org.eclipse.remote.ui;bundle-version="2.0.0",
- org.eclipse.remote.telnet.core;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
+Import-Package: org.eclipse.core.runtime,
+ org.eclipse.jface.dialogs,
+ org.eclipse.jface.operation,
+ org.eclipse.jface.resource,
+ org.eclipse.jface.viewers,
+ org.eclipse.jface.window,
+ org.eclipse.jface.wizard,
+ org.eclipse.osgi.util,
+ org.eclipse.remote.core,
+ org.eclipse.remote.core.exception,
+ org.eclipse.remote.telnet.core,
+ org.eclipse.remote.ui,
+ org.eclipse.swt,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.widgets,
+ org.eclipse.ui.plugin,
+ org.osgi.framework
diff --git a/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF
index 7980f4f1c63..a541a0fd84e 100644
--- a/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF
@@ -5,16 +5,6 @@ Bundle-SymbolicName: org.eclipse.remote.ui;singleton:=true
 Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.remote.internal.ui.RemoteUIPlugin
 Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.ui.forms,
- org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.remote.core;bundle-version="2.0",
- org.eclipse.core.filesystem,
- org.eclipse.core.resources,
- org.eclipse.ui.trace,
- org.eclipse.ui.navigator,
- org.eclipse.core.expressions
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.remote.internal.ui;x-internal:=true,
@@ -25,3 +15,37 @@ Export-Package: org.eclipse.remote.internal.ui;x-internal:=true,
  org.eclipse.remote.ui.dialogs,
  org.eclipse.remote.ui.widgets
 Bundle-Localization: plugin
+Import-Package: org.eclipse.core.commands,
+ org.eclipse.core.expressions,
+ org.eclipse.core.filesystem,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.core.runtime.jobs,
+ org.eclipse.core.runtime.preferences;version="3.3.0",
+ org.eclipse.jface.action,
+ org.eclipse.jface.dialogs,
+ org.eclipse.jface.operation,
+ org.eclipse.jface.preference,
+ org.eclipse.jface.resource,
+ org.eclipse.jface.util,
+ org.eclipse.jface.viewers,
+ org.eclipse.jface.window,
+ org.eclipse.jface.wizard,
+ org.eclipse.osgi.util,
+ org.eclipse.remote.core,
+ org.eclipse.remote.core.exception,
+ org.eclipse.remote.internal.core.preferences,
+ org.eclipse.remote.ui.widgets,
+ org.eclipse.swt,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.widgets,
+ org.eclipse.ui,
+ org.eclipse.ui.dialogs,
+ org.eclipse.ui.handlers,
+ org.eclipse.ui.model,
+ org.eclipse.ui.navigator,
+ org.eclipse.ui.plugin,
+ org.eclipse.ui.progress,
+ org.osgi.framework
diff --git a/features/org.eclipse.remote-feature/feature.xml b/features/org.eclipse.remote-feature/feature.xml
index 2612f32055f..3dfe65909ec 100644
--- a/features/org.eclipse.remote-feature/feature.xml
+++ b/features/org.eclipse.remote-feature/feature.xml
@@ -19,20 +19,6 @@
       %license
    </license>
 
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.filesystem"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.variables"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.equinox.security"/>
-      <import plugin="org.eclipse.ui.forms"/>
-      <import plugin="org.eclipse.jsch.core"/>
-      <import plugin="com.jcraft.jsch"/>
-      <import plugin="org.eclipse.jface"/>
-   </requires>
-
    <plugin
          id="org.eclipse.remote.core"
          download-size="0"
diff --git a/releng/org.eclipse.remote.build/pom.xml b/releng/org.eclipse.remote.build/pom.xml
index b7dd2be2d8a..32e8af4e6e3 100644
--- a/releng/org.eclipse.remote.build/pom.xml
+++ b/releng/org.eclipse.remote.build/pom.xml
@@ -43,6 +43,7 @@
 	</licenses>
 
 	<modules>
+		<module>../../releng/org.eclipse.remote.target</module>
 		<!-- Remote feature -->
 		<module>../../bundles/org.eclipse.remote.core</module>
 		<module>../../bundles/org.eclipse.remote.jsch.core</module>
@@ -66,17 +67,17 @@
 	</modules>
 
 	<repositories>
-		<repository>
+		<!-- repository>
 			<id>platform-${platform-version}</id>
 			<url>${platform-site}</url>
 			<layout>p2</layout>
-		</repository>
+		</repository-->
 		<repository>
 			<id>license</id>
 			<url>${license-site}</url>
 			<layout>p2</layout>
 		</repository>
-		<repository>
+		<!--repository>
 			<id>tm</id>
 			<url>${tm-site}</url>
 			<layout>p2</layout>
@@ -85,7 +86,7 @@
 			<id>cdt</id>
 			<url>${cdt-site}</url>
 			<layout>p2</layout>
-		</repository>
+		</repository-->
 	</repositories>
 
 	<build>
@@ -130,6 +131,23 @@
 							<arch>x86_64</arch>
 						</environment>
 					</environments>
+					<dependency-resolution>
+						<extraRequirements>
+							<requirement>
+								<type>eclipse-plugin</type>
+								<id>org.eclipse.ui.ide</id>
+								<versionRange>0.0.0</versionRange>
+							</requirement>
+						</extraRequirements>
+		          </dependency-resolution>
+				  <target>
+						<artifact>
+							<groupId>org.eclipse.remote</groupId>
+							<artifactId>org.eclipse.remote.target</artifactId>
+							<version>2.0.2-SNAPSHOT</version>
+							<classifier>mars</classifier>
+						</artifact>
+				  </target>
 				</configuration>
 			</plugin>
 			<plugin>
diff --git a/releng/org.eclipse.remote.target/.project b/releng/org.eclipse.remote.target/.project
new file mode 100644
index 00000000000..4493f6fb411
--- /dev/null
+++ b/releng/org.eclipse.remote.target/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.remote.target</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/releng/org.eclipse.remote.build/mars.target b/releng/org.eclipse.remote.target/mars.target
similarity index 92%
rename from releng/org.eclipse.remote.build/mars.target
rename to releng/org.eclipse.remote.target/mars.target
index b047b1de5c3..c848db9d253 100644
--- a/releng/org.eclipse.remote.build/mars.target
+++ b/releng/org.eclipse.remote.target/mars.target
@@ -3,8 +3,8 @@
 <target name="mars" sequenceNumber="0">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="4.5.0.I20141210-2000"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.5milestones/"/>
+<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.5/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.mockito" version="0.0.0"/>
@@ -13,6 +13,7 @@
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.cdt.native.serial" version="0.0.0"/>
+<unit id="org.eclipse.cdt.core" version="0.0.0"/>
 <repository location="http://download.eclipse.org/tools/cdt/builds/master/nightly/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
diff --git a/releng/org.eclipse.remote.target/pom.xml b/releng/org.eclipse.remote.target/pom.xml
new file mode 100644
index 00000000000..a2c6a72aa8c
--- /dev/null
+++ b/releng/org.eclipse.remote.target/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.eclipse.remote</groupId>
+		<artifactId>remote-parent</artifactId>
+		<version>2.0.2-SNAPSHOT</version>
+		<relativePath>../org.eclipse.remote.build/pom.xml</relativePath>
+	</parent>
+
+	<version>2.0.2-SNAPSHOT</version>
+	<artifactId>org.eclipse.remote.target</artifactId>
+	<packaging>pom</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+			<groupId>org.codehaus.mojo</groupId>
+			<artifactId>build-helper-maven-plugin</artifactId>
+			<version>1.9.1</version>
+				<executions>
+					<execution>
+						<id>attach-artifacts</id>
+						<phase>package</phase>
+						<goals>
+							<goal>attach-artifact</goal>
+						</goals>
+						<configuration>
+							<artifacts>
+								<artifact>
+									<file>mars.target</file>
+									<type>target</type>
+									<classifier>mars</classifier>
+								</artifact>
+							</artifacts>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>