Releng: Update Target Platforms and add comments on pom-config

1. Use planner instead of slicer in *.target files
   - This ensures that all dependencies are met for test and dev.
2. Sort *.target files to make them better comparable
3. Align pom-config.xml with TM and fix some download locations
   to better model release streams

Change-Id: I706fcd6eeaed4552c0c0e627e2c754bc800a59b7
Signed-off-by: Martin Oberhuber <mober.at+eclipse@gmail.com>

5 files changed, 183 insertions, 201 deletions

diff --git a/admin/pom-config.xml b/admin/pom-config.xml
index fa8443fae..0b2f5667b 100644
--- a/admin/pom-config.xml
+++ b/admin/pom-config.xml
@@ -29,8 +29,10 @@
 
 	<properties>
 		<!-- Define version id's to be used in the plugins section -->
+		<!-- We stick to tycho-0.22 since it supports Java 7 for building -->
+		<!-- See https://bugs.eclipse.org/bugs/show_bug.cgi?id=518104 for reference -->
 		<tycho-version>0.22.0</tycho-version>
-		<tycho-extras-version>0.22.0</tycho-extras-version>
+		<tycho-extras-version>${tycho-version}</tycho-extras-version>
 		<maven-resources-version>2.7</maven-resources-version>
 		<maven-antrun-version>1.8</maven-antrun-version>
 		<gmaven-version>1.5</gmaven-version>
@@ -38,6 +40,8 @@
 		<findbugs-version>2.5.2</findbugs-version>
 		<!-- Check available versions at https://repository.sonatype.org/content/repositories/public/org/jacoco/jacoco-maven-plugin -->
 		<jacoco-version>0.7.4.201502262128</jacoco-version>
+		<!-- Needed by Jacoco, see http://www.eclemma.org/jacoco/trunk/doc/prepare-agent-mojo.html -->
+		<tycho.testArgLine></tycho.testArgLine>
 		<eclipse-jarsigner-version>1.1.2</eclipse-jarsigner-version>
 
 		<!-- Common global properties -->
@@ -59,7 +63,7 @@
 		<cdt-site>http://download.eclipse.org/tools/cdt/releases/kepler</cdt-site>
 		<tm-site>http://download.eclipse.org/tm/updates/4.0</tm-site>
 		<terminal-site>http://download.eclipse.org/tm/terminal/updates/4.0</terminal-site>
-		<ptp-remote-site>http://download.eclipse.org/tools/ptp/builds/remote/2.0.0</ptp-remote-site>
+		<remote-site>http://download.eclipse.org/tools/ptp/builds/remote/2.0.0</remote-site>
 		<rxtx-site>http://archive.eclipse.org/tm/updates/rxtx</rxtx-site>
 		<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository</orbit-site>
 		<swtbot-site>http://download.eclipse.org/technology/swtbot/releases/latest/</swtbot-site>
@@ -102,8 +106,8 @@
 			<layout>p2</layout>
 		</repository>
 		<repository>
-			<id>ptp-remote</id>
-			<url>${ptp-remote-site}</url>
+			<id>remote</id>
+			<url>${remote-site}</url>
 			<layout>p2</layout>
 		</repository>
 		<repository>
@@ -136,7 +140,7 @@
 
 	<profiles>
 		<profile>
-			<!-- Eclipse 4.3.x (Kepler) -->
+			<!-- Eclipse 4.3.2 (Kepler SR2), CDT 8.3.0 (Kepler SR2) -->
 			<id>kepler</id>
 
 			<properties>
@@ -145,38 +149,38 @@
 		</profile>
 
 		<profile>
-			<!-- Eclipse 4.4 (Luna), CDT 8.4.0 (Luna) -->
+			<!-- Eclipse 4.4.2 (Luna SR2), CDT 8.6.0 (Luna SR2) -->
 			<id>luna</id>
 
 			<properties>
 				<platform-site>http://download.eclipse.org/eclipse/updates/4.4</platform-site>
-				<cdt-site>http://download.eclipse.org/tools/cdt/releases/8.4</cdt-site>
+				<cdt-site>http://download.eclipse.org/tools/cdt/releases/8.6</cdt-site>
 			</properties>
 		</profile>
 
 		<profile>
-			<!-- Eclipse 4.5 (Mars), CDT 8.7.0 (Mars) -->
+			<!-- Eclipse 4.5.2 (Mars.2), CDT 8.8.1 (Mars.2) -->
 			<id>mars</id>
 
 			<properties>
 				<platform-site>http://download.eclipse.org/eclipse/updates/4.5</platform-site>
-				<cdt-site>http://download.eclipse.org/tools/cdt/releases/8.7</cdt-site>
+				<cdt-site>http://download.eclipse.org/tools/cdt/releases/8.8.1</cdt-site>
 				<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository</orbit-site>
 			</properties>
-
 		</profile>
 
 		<profile>
-			<!-- Eclipse 4.6 (Neon 1), CDT 9.1.0 (Neon 1) -->
+			<!-- Eclipse 4.6.3 (Neon.3), CDT 9.2.1 (Neon.3) -->
 			<id>neon</id>
 
 			<properties>
 				<platform-site>http://download.eclipse.org/eclipse/updates/4.6</platform-site>
-				<cdt-site>http://download.eclipse.org/tools/cdt/releases/9.1</cdt-site>
-				<cdt-launchbar-site>http://download.eclipse.org/tools/cdt/launchbar/neon.rc4</cdt-launchbar-site>
-				<ptp-remote-site>http://download.eclipse.org/tools/ptp/builds/remote/2.1.0</ptp-remote-site>
-				<terminal-site>http://download.eclipse.org/tm/terminal/updates/4.1</terminal-site>
-				<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository</orbit-site>
+				<cdt-site>http://download.eclipse.org/tools/cdt/releases/9.2</cdt-site>
+				<cdt-launchbar-site>http://download.eclipse.org/tools/cdt/launchbar/neon.2</cdt-launchbar-site>
+				<remote-site>http://download.eclipse.org/tools/ptp/builds/remote/2.1.1</remote-site>
+				<terminal-site>http://download.eclipse.org/tm/terminal/updates/4.2</terminal-site>
+				<tm-site>http://download.eclipse.org/tm/updates/4.2</tm-site>
+				<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository</orbit-site>
 			</properties>
 
 			<repositories>
@@ -189,20 +193,16 @@
 		</profile>
 
 		<profile>
-			<!-- Eclipse 4.7 (Oxygen), CDT 9.2 -->
+			<!-- Eclipse 4.7 (Oxygen), CDT 9.3 -->
 			<id>oxygen</id>
 
 			<properties>
 				<platform-site>http://download.eclipse.org/eclipse/updates/4.7milestones</platform-site>
-				<cdt-site>http://download.eclipse.org/tools/cdt/builds/9.2/nightly</cdt-site>
+				<cdt-site>http://download.eclipse.org/tools/cdt/builds/oxygen/milestones</cdt-site>
 				<cdt-launchbar-site>https://hudson.eclipse.org/cdt/job/launchbar-master/lastSuccessfulBuild/artifact/repo/target/repository</cdt-launchbar-site>
-				<!--
-				<ptp-remote-site>http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones</ptp-remote-site>
-				2.1.1 is really Neon.2, but necessary to fix broken 4.7-tests
-				-->
-				<ptp-remote-site>http://download.eclipse.org/tools/ptp/builds/remote/2.1.1</ptp-remote-site>
-				<terminal-site>http://download.eclipse.org/tm/terminal/updates/4.2milestones</terminal-site>
-				<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository</orbit-site>
+				<remote-site>http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones</remote-site>
+				<terminal-site>http://download.eclipse.org/tm/terminal/updates/4.3milestones</terminal-site>
+				<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository</orbit-site>
 			</properties>
 
 			<repositories>
diff --git a/admin/target-defs/eclipse-4.4.x-luna.target b/admin/target-defs/eclipse-4.4.x-luna.target
index 470746084..d54f799a6 100644
--- a/admin/target-defs/eclipse-4.4.x-luna.target
+++ b/admin/target-defs/eclipse-4.4.x-luna.target
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Eclipse 4.4.x (Luna)" sequenceNumber="64">
+<?pde version="3.8"?><target name="Eclipse 4.4.x (Luna)" sequenceNumber="65">
 <locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
-<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
-<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-<unit id="org.hamcrest.library.source" version="1.3.0.v201505072020"/>
-<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
-<unit id="org.eclipse.swtbot.ide.feature.group" version="2.4.0.201604200752"/>
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.4.0.201604200752"/>
-<unit id="org.eclipse.swtbot.feature.group" version="2.4.0.201604200752"/>
-<unit id="org.eclipse.swtbot.forms.feature.group" version="2.4.0.201604200752"/>
-<unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/>
-<repository location="http://download.eclipse.org/technology/swtbot/releases/latest"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/>
+<repository location="http://archive.eclipse.org/tm/updates/rxtx"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
 <repository location="http://download.eclipse.org/cbi/updates/license"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="com.google.gson.source" version="2.2.4.v201311231704"/>
-<unit id="com.google.gson" version="2.2.4.v201311231704"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.platform.ide" version="4.4.2.M20150204-1700"/>
+<unit id="org.eclipse.test.feature.group" version="3.6.101.v20150202-1306"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.4"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.cdt.sdk.feature.group" version="8.5.0.201409172108"/>
-<repository location="http://download.eclipse.org/tools/cdt/releases/8.5"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.egit.feature.group" version="3.4.2.201412180340-r"/>
+<repository location="http://download.eclipse.org/releases/luna"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.tm.terminal.core.sdk.feature.group" version="3.3.300.201406060905"/>
-<repository location="http://download.eclipse.org/tm/updates/3.6"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.5.0.201609021837"/>
+<unit id="org.eclipse.swtbot.feature.group" version="2.5.0.201609021837"/>
+<unit id="org.eclipse.swtbot.forms.feature.group" version="2.5.0.201609021837"/>
+<unit id="org.eclipse.swtbot.ide.feature.group" version="2.5.0.201609021837"/>
+<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
+<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
+<repository location="http://download.eclipse.org/technology/swtbot/releases/latest"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/>
-<repository location="http://archive.eclipse.org/tm/updates/rxtx"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.tm.terminal.sdk.feature.feature.group" version="4.0.0.201506040610"/>
+<repository location="http://download.eclipse.org/tm/terminal/updates/4.0"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="4.4.2.M20150204-1700"/>
-<unit id="org.eclipse.test.feature.group" version="3.6.101.v20150202-1306"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.4"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.rse.sdk.feature.group" version="3.7.2.201610260947"/>
+<repository location="http://download.eclipse.org/updates/4.0"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.pde.feature.group" version="3.10.1.v20150204-1700"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.10.2.v20150123-0452"/>
-<repository location="http://download.eclipse.org/releases/luna"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.cdt.sdk.feature.group" version="8.6.0.201502131403"/>
+<repository location="http://download.eclipse.org/tools/cdt/releases/8.6"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.google.gson" version="2.2.4.v201311231704"/>
+<unit id="org.apache.commons.net" version="3.2.0.v201305141515"/>
+<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.remote.feature.group" version="2.0.0.201507010000"/>
-<unit id="org.eclipse.remote.source.feature.group" version="2.0.0.201507010000"/>
 <repository location="http://download.eclipse.org/tools/ptp/builds/remote/2.0.0"/>
 </location>
 </locations>
diff --git a/admin/target-defs/eclipse-4.5.x-mars.target b/admin/target-defs/eclipse-4.5.x-mars.target
index c1661539b..b87b70e25 100644
--- a/admin/target-defs/eclipse-4.5.x-mars.target
+++ b/admin/target-defs/eclipse-4.5.x-mars.target
@@ -1,54 +1,54 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Eclipse 4.5.x (Mars)" sequenceNumber="71">
+<?pde version="3.8"?><target name="Eclipse 4.5.x (Mars)" sequenceNumber="72">
 <locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
-<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
-<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-<unit id="org.hamcrest.library.source" version="1.3.0.v201505072020"/>
-<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
-<unit id="org.eclipse.swtbot.ide.feature.group" version="2.4.0.201604200752"/>
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.4.0.201604200752"/>
-<unit id="org.eclipse.swtbot.feature.group" version="2.4.0.201604200752"/>
-<unit id="org.eclipse.swtbot.forms.feature.group" version="2.4.0.201604200752"/>
-<unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/>
-<repository location="http://download.eclipse.org/technology/swtbot/releases/latest"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/>
+<repository location="http://archive.eclipse.org/tm/updates/rxtx"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
 <repository location="http://download.eclipse.org/cbi/updates/license"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="com.google.gson.source" version="2.2.4.v201311231704"/>
-<unit id="com.google.gson" version="2.2.4.v201311231704"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.cdt.sdk.feature.group" version="8.7.0.201506070905"/>
-<repository location="http://download.eclipse.org/tools/cdt/releases/8.7"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/>
-<repository location="http://archive.eclipse.org/tm/updates/rxtx"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="4.5.2.M20160212-1500"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.platform.ide" version="4.5.2.M20160212-1500"/>
 <unit id="org.eclipse.test.feature.group" version="3.7.0.v20150428-2048"/>
 <repository location="http://download.eclipse.org/eclipse/updates/4.5"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.pde.feature.group" version="3.11.2.v20160212-1500"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.11.2.v20160208-0841"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.egit.feature.group" version="4.1.1.201511131810-r"/>
 <repository location="http://download.eclipse.org/releases/mars"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.5.0.201609021837"/>
+<unit id="org.eclipse.swtbot.feature.group" version="2.5.0.201609021837"/>
+<unit id="org.eclipse.swtbot.forms.feature.group" version="2.5.0.201609021837"/>
+<unit id="org.eclipse.swtbot.ide.feature.group" version="2.5.0.201609021837"/>
+<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
+<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
+<repository location="http://download.eclipse.org/technology/swtbot/releases/latest"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.tm.terminal.sdk.feature.feature.group" version="4.0.0.201506040610"/>
 <repository location="http://download.eclipse.org/tm/terminal/updates/4.0"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.remote.feature.group" version="2.0.0.201507010000"/>
-<unit id="org.eclipse.remote.source.feature.group" version="2.0.0.201507010000"/>
-<repository location="http://download.eclipse.org/tools/ptp/builds/remote/2.0.0"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.rse.sdk.feature.group" version="3.7.2.201610260947"/>
+<repository location="http://download.eclipse.org/updates/4.0"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.cdt.sdk.feature.group" version="8.7.0.201506070905"/>
+<repository location="http://download.eclipse.org/tools/cdt/releases/8.8.1"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.google.gson" version="2.2.4.v201311231704"/>
+<unit id="org.apache.commons.net" version="3.2.0.v201305141515"/>
+<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.remote.feature.group" version="2.0.2.201601261800"/>
+<repository location="http://download.eclipse.org/tools/ptp/builds/remote/mars/milestones"/>
 </location>
 </locations>
 </target>
diff --git a/admin/target-defs/eclipse-4.6.x-neon.target b/admin/target-defs/eclipse-4.6.x-neon.target
index 1ebdcf59c..bf52f06b4 100644
--- a/admin/target-defs/eclipse-4.6.x-neon.target
+++ b/admin/target-defs/eclipse-4.6.x-neon.target
@@ -1,70 +1,61 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Eclipse 4.6.x (Neon)" sequenceNumber="100">
+<?pde version="3.8"?><target name="Eclipse 4.6.x (Neon)" sequenceNumber="105">
 <locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="4.6.1.M20160907-1200"/>
-<unit id="org.eclipse.test.feature.group" version="3.7.100.v20160503-1715"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.6/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.rse.terminals.source.feature.group" version="3.8.0.201603211627"/>
-<unit id="org.eclipse.rse.sdk.feature.group" version="3.7.1.201603211627"/>
-<unit id="org.eclipse.rse.terminals.feature.group" version="3.8.0.201603211627"/>
-<repository location="http://download.eclipse.org/tm/updates/4.1milestones"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/>
+<repository location="http://archive.eclipse.org/tm/updates/rxtx"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
 <repository location="http://download.eclipse.org/cbi/updates/license"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/>
-<repository location="http://archive.eclipse.org/tm/updates/rxtx"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.platform.ide" version="4.6.3.M20170301-0400"/>
+<unit id="org.eclipse.test.feature.group" version="3.7.100.v20170213-1316"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.6/"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.pde.feature.group" version="3.12.1.v20160907-1200"/>
-<unit id="org.eclipse.launchbar.feature.group" version="2.0.1.201608311749"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160526-0356"/>
-<unit id="org.eclipse.egit.feature.group" version="4.4.1.201607150455-r"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.egit.feature.group" version="4.6.1.201703071140-r"/>
 <repository location="http://download.eclipse.org/releases/neon"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
-<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-<unit id="org.hamcrest.library.source" version="1.3.0.v201505072020"/>
-<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
-<unit id="org.eclipse.swtbot.ide.feature.group" version="2.5.0.201609021837"/>
 <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.5.0.201609021837"/>
 <unit id="org.eclipse.swtbot.feature.group" version="2.5.0.201609021837"/>
 <unit id="org.eclipse.swtbot.forms.feature.group" version="2.5.0.201609021837"/>
-<unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/>
-<repository location="http://download.eclipse.org/technology/swtbot/releases/latest"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.remote.feature.group" version="2.1.0.201605242106"/>
-<unit id="org.eclipse.remote.source.feature.group" version="2.1.0.201605242106"/>
-<repository location="http://download.eclipse.org/tools/ptp/builds/remote/2.1.0"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.cdt.sdk.feature.group" version="9.1.0.201609121658"/>
-<repository location="http://download.eclipse.org/tools/cdt/releases/9.1"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.swtbot.ide.feature.group" version="2.5.0.201609021837"/>
+<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
+<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
+<repository location="http://download.eclipse.org/technology/swtbot/releases/2.5"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.tm.terminal.connector.local.sdk.feature.feature.group" version="4.2.0.201611281915"/>
+<unit id="org.eclipse.tm.terminal.connector.serial.sdk.feature.feature.group" version="4.2.0.201611281915"/>
+<unit id="org.eclipse.tm.terminal.connector.ssh.sdk.feature.feature.group" version="4.2.0.201611281915"/>
+<unit id="org.eclipse.tm.terminal.connector.telnet.sdk.feature.feature.group" version="4.2.0.201611281915"/>
+<unit id="org.eclipse.tm.terminal.control.sdk.feature.feature.group" version="4.2.0.201611281915"/>
+<unit id="org.eclipse.tm.terminal.sdk.feature.feature.group" version="4.2.0.201611281915"/>
+<unit id="org.eclipse.tm.terminal.view.sdk.feature.feature.group" version="4.2.0.201611281915"/>
+<repository location="http://download.eclipse.org/tm/terminal/updates/4.2milestones"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.rse.feature.group" version="3.7.2.201610260947"/>
+<unit id="org.eclipse.rse.terminals.feature.group" version="3.8.0.201610260947"/>
+<repository location="http://download.eclipse.org/tm/updates/4.2"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.cdt.sdk.feature.group" version="9.2.1.201704050430"/>
+<repository location="http://download.eclipse.org/tools/cdt/releases/9.2"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="com.google.gson" version="2.2.4.v201311231704"/>
-<unit id="org.apache.commons.net.source" version="3.2.0.v201305141515"/>
-<unit id="com.google.gson.source" version="2.2.4.v201311231704"/>
 <unit id="org.apache.commons.net" version="3.2.0.v201305141515"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+<repository location="http://download.eclipse.org/tools/orbit/R-builds/R20170307180635/repository"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.tm.terminal.connector.ssh.sdk.feature.feature.group" version="4.1.0.201606052351"/>
-<unit id="org.eclipse.tm.terminal.connector.local.sdk.feature.feature.group" version="4.1.0.201606052351"/>
-<unit id="org.eclipse.tm.terminal.connector.telnet.sdk.feature.feature.group" version="4.1.0.201606052351"/>
-<unit id="org.eclipse.tm.terminal.control.sdk.feature.feature.group" version="4.1.0.201606052351"/>
-<unit id="org.eclipse.tm.terminal.sdk.feature.feature.group" version="4.1.0.201606052351"/>
-<unit id="org.eclipse.tm.terminal.view.sdk.feature.feature.group" version="4.1.0.201606052351"/>
-<unit id="org.eclipse.tm.terminal.connector.serial.sdk.feature.feature.group" version="4.1.0.201606052351"/>
-<repository location="http://download.eclipse.org/tm/terminal/updates/4.1"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.remote.feature.group" version="2.1.1.201612062149"/>
+<repository location="http://download.eclipse.org/tools/ptp/builds/remote/neon/milestones"/>
 </location>
 </locations>
 </target>
diff --git a/admin/target-defs/eclipse-4.7.x-oxygen.target b/admin/target-defs/eclipse-4.7.x-oxygen.target
index 03a4116ff..195c885af 100644
--- a/admin/target-defs/eclipse-4.7.x-oxygen.target
+++ b/admin/target-defs/eclipse-4.7.x-oxygen.target
@@ -1,66 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Eclipse 4.7.x (Oxygen)" sequenceNumber="20">
+<?pde version="3.8"?><target name="Eclipse 4.7.x (Oxygen)" sequenceNumber="22">
 <locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.5.0.201609021837"/>
-<unit id="org.eclipse.swtbot.feature.group" version="2.5.0.201609021837"/>
-<unit id="org.eclipse.swtbot.forms.feature.group" version="2.5.0.201609021837"/>
-<unit id="org.eclipse.swtbot.ide.feature.group" version="2.5.0.201609021837"/>
-<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
-<unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/>
-<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
-<unit id="org.hamcrest.library.source" version="1.3.0.v201505072020"/>
-<repository location="http://download.eclipse.org/technology/swtbot/releases/latest"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/>
+<repository location="http://archive.eclipse.org/tm/updates/rxtx"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
 <repository location="http://download.eclipse.org/cbi/updates/license"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/>
-<repository location="http://archive.eclipse.org/tm/updates/rxtx"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="4.7.0.I20170524-2000"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.platform.ide" version="4.7.0.I20170608-0530"/>
 <unit id="org.eclipse.test.feature.group" version="3.7.200.v20170511-1043"/>
 <repository location="http://download.eclipse.org/eclipse/updates/4.7milestones/"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.remote.feature.group" version="3.0.0.201701190302"/>
-<unit id="org.eclipse.remote.source.feature.group" version="3.0.0.201701190302"/>
-<repository location="http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.egit.feature.group" version="4.8.0.201705170830-rc1"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.13.0.v20170504-0807"/>
-<unit id="org.eclipse.jgit.feature.group" version="4.8.0.201705170830-rc1"/>
-<unit id="org.eclipse.pde.feature.group" version="3.13.0.v20170608-0925"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.egit.feature.group" version="4.8.0.201706111038-r"/>
 <repository location="http://download.eclipse.org/staging/oxygen"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.cdt.sdk.feature.group" version="9.3.0.201705301432"/>
-<repository location="http://download.eclipse.org/tools/cdt/builds/oxygen/milestones"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.launchbar.feature.group" version="2.1.1.201705251527"/>
-<repository location="https://hudson.eclipse.org/cdt/job/launchbar-master/lastSuccessfulBuild/artifact/repo/target/repository"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.rse.sdk.feature.group" version="3.7.3.201704251225"/>
-<unit id="org.eclipse.rse.terminals.feature.group" version="3.8.0.201704251225"/>
-<unit id="org.eclipse.rse.terminals.source.feature.group" version="3.8.0.201704251225"/>
-<repository location="http://download.eclipse.org/tm/updates/4.3milestones"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
-<unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/>
-<unit id="org.apache.commons.net" version="3.2.0.v201305141515"/>
-<unit id="org.apache.commons.net.source" version="3.2.0.v201305141515"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.5.0.201609021837"/>
+<unit id="org.eclipse.swtbot.feature.group" version="2.5.0.201609021837"/>
+<unit id="org.eclipse.swtbot.forms.feature.group" version="2.5.0.201609021837"/>
+<unit id="org.eclipse.swtbot.ide.feature.group" version="2.5.0.201609021837"/>
+<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
+<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
+<repository location="http://download.eclipse.org/technology/swtbot/releases/latest"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.tm.terminal.connector.local.sdk.feature.feature.group" version="4.3.0.201705161105"/>
 <unit id="org.eclipse.tm.terminal.connector.serial.sdk.feature.feature.group" version="4.3.0.201705161105"/>
 <unit id="org.eclipse.tm.terminal.connector.ssh.sdk.feature.feature.group" version="4.3.0.201705161105"/>
@@ -70,5 +38,28 @@
 <unit id="org.eclipse.tm.terminal.view.sdk.feature.feature.group" version="4.3.0.201705161105"/>
 <repository location="http://download.eclipse.org/tm/terminal/updates/4.3milestones"/>
 </location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.rse.feature.group" version="3.7.3.201704251225"/>
+<unit id="org.eclipse.rse.terminals.feature.group" version="3.8.0.201704251225"/>
+<repository location="http://download.eclipse.org/tm/updates/4.3milestones"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.cdt.sdk.feature.group" version="9.3.0.201706051601"/>
+<repository location="http://download.eclipse.org/tools/cdt/builds/oxygen/milestones"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
+<unit id="org.apache.commons.net" version="3.2.0.v201305141515"/>
+<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+<repository location="http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.remote.feature.group" version="3.0.0.201706052031"/>
+<repository location="http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.launchbar.feature.group" version="2.1.1.201705251527"/>
+<repository location="https://hudson.eclipse.org/cdt/job/launchbar-master/lastSuccessfulBuild/artifact/repo/target/repository"/>
+</location>
 </locations>
 </target>