Releng: Update target platform definitions and add Neon build1.4_WR_20150925_4.4.01.4_WR_20150925_4.4.0_bugfix

configuration

6 files changed, 524 insertions, 403 deletions

diff --git a/admin/pom-config.xml b/admin/pom-config.xml
index 08a33628d..e60de25f2 100644
--- a/admin/pom-config.xml
+++ b/admin/pom-config.xml
@@ -1,397 +1,407 @@
-<?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>

-

-	<prerequisites>

-		<maven>3.0</maven>

-	</prerequisites>

-

-	<groupId>org.eclipse.tcf</groupId>

-	<artifactId>org.eclipse.tcf.maven-config</artifactId>

-	<version>1.4.0-SNAPSHOT</version> 

-	<packaging>pom</packaging>

-	<name>TCF and Target Explorer, Maven Configuration Master</name>

-

-	<licenses>

-		<license>

-			<name>Eclipse Public License</name>

-			<url>http://www.eclipse.org/legal/epl-v10.html</url>

-			<distribution>repo</distribution>

-		</license>

-	</licenses>

-

-	<organization>

-		<name>Eclipse Foundation</name>

-		<url>http://www.eclipse.org/</url>

-	</organization>

-	

-	<properties>

-		<!-- Define version id's to be used in the plugins section -->

-		<tycho-version>0.22.0</tycho-version>

-		<tycho-extras-version>0.22.0</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>

-        <!-- Stick to Findbugs 2.5.2 until newer versions are supported by hudson.eclipse.org -->

-		<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>

-		<eclipse-jarsigner-version>1.1.2</eclipse-jarsigner-version>

-

-		<!-- Common global properties -->

-		<adminDir>${env.WORKSPACE}/admin</adminDir>

-		<tcf-stream>development</tcf-stream>

-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

-

-		<!-- JaCoCo global properties -->

-		<jacoco.skip>false</jacoco.skip>

-		<jacoco.output>file</jacoco.output>

-		<jacoco.dumpOnExit>true</jacoco.dumpOnExit>

-

-		<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.git</tycho.scmUrl>

-

-		<!-- P2 repository URL's -->

-		<!-- Default: Eclipse 3.8.x (Juno), CDT 8.3.0 (Kepler), TM 4.0 (Mars) -->

-		<platform-site>http://download.eclipse.org/eclipse/updates/3.8</platform-site>

-		<license-site>http://download.eclipse.org/cbi/updates/license</license-site>

-        <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>

-		<rxtx-site>http://archive.eclipse.org/tm/updates/rxtx</rxtx-site>

-		<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/</orbit-site>

-		<swtbot-site>http://download.eclipse.org/technology/swtbot/releases/latest/</swtbot-site>

-  	</properties>

-

-	<repositories>

-        <repository>

-            <id>license-feature</id>

-            <url>${license-site}</url>

-            <layout>p2</layout>

-        </repository>	

-		<repository>

-			<id>platform</id>

-			<url>${platform-site}</url>

-			<layout>p2</layout>

-		</repository>

-		<repository>

-			<id>orbit</id>

-			<url>${orbit-site}</url>

-			<layout>p2</layout>

-		</repository>

-		<repository>

-			<id>cdt</id>

-			<url>${cdt-site}</url>

-			<layout>p2</layout>

-		</repository>

-		<repository>

-			<id>terminal</id>

-			<url>${terminal-site}</url>

-			<layout>p2</layout>

-		</repository>

-		<repository>

-			<id>tm</id>

-			<url>${tm-site}</url>

-			<layout>p2</layout>

-		</repository>

-		<repository>

-			<id>swtbot</id>

-			<url>${swtbot-site}</url>

-			<layout>p2</layout>

-		</repository>

-		<repository>

-			<id>ptp-remote</id>

-			<url>${ptp-remote-site}</url>

-			<layout>p2</layout>

-		</repository>

-		<repository>

-			<id>rxtx</id>

-			<url>${rxtx-site}</url>

-			<layout>p2</layout>

-		</repository>

-	</repositories>

-

-	<pluginRepositories>

-		<pluginRepository>

-			<id>sonatype</id>

-			<url>https://oss.sonatype.org/content/repositories/public</url>

-  			<snapshots>

-				<enabled>true</enabled>

-			</snapshots>

-			<releases>

-				<enabled>true</enabled>

-			</releases>

-		</pluginRepository>

-		<pluginRepository>

-			<id>cbi</id>

-			<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>

-		</pluginRepository>

-		<pluginRepository>

-			<id>cbi-snapshots</id>

-			<url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</url>

-		</pluginRepository>

-	</pluginRepositories>

-

-	<profiles>

-	    <profile>

-		    <!-- Eclipse 4.3.x (Kepler) -->

-		    <id>kepler</id>

-			

-			<properties>

-		        <platform-site>http://download.eclipse.org/eclipse/updates/4.3</platform-site>

-            </properties>

-		</profile>

-

-	    <profile>

-		    <!-- Eclipse 4.4 (Luna), CDT 8.4.0 (Luna) -->

-		    <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>

-            </properties>

-		</profile>

-

-

-	    <profile>

-		    <!-- Eclipse 4.5 (Mars), CDT 8.7.0 (Mars) -->

-		    <id>mars</id>

-			

-			<properties>

-		        <platform-site>http://download.eclipse.org/eclipse/updates/4.5milestones</platform-site>

-                <cdt-site>http://download.eclipse.org/tools/cdt/builds/mars/milestones</cdt-site>

-            </properties>

-			

-		</profile>

-    </profiles>

-	

-	<build>

-		<plugins>

-			<plugin>

-				<groupId>org.eclipse.tycho</groupId>

-				<artifactId>tycho-maven-plugin</artifactId>

-				<version>${tycho-version}</version>

-				<extensions>true</extensions>

-			</plugin>

-		</plugins>

-		<pluginManagement>

-			<plugins>

-				<plugin>

-					<groupId>org.eclipse.tycho</groupId>

-					<artifactId>tycho-maven-plugin</artifactId>

-					<version>${tycho-version}</version>

-					<extensions>true</extensions>

-				</plugin>

-				<plugin>

-					<groupId>org.eclipse.tycho</groupId>

-					<artifactId>target-platform-configuration</artifactId>

-					<version>${tycho-version}</version>

-					<configuration>

-						<environments>

-							<environment>

-								<os>linux</os>

-								<ws>gtk</ws>

-								<arch>x86</arch>

-							</environment>

-							<environment>

-								<os>linux</os>

-								<ws>gtk</ws>

-								<arch>x86_64</arch>

-							</environment>

-							<environment>

-								<os>win32</os>

-								<ws>win32</ws>

-								<arch>x86</arch>

-							</environment>

-							<environment>

-								<os>win32</os>

-								<ws>win32</ws>

-								<arch>x86_64</arch>

-							</environment>

-						</environments>

-						<resolver>p2</resolver>

-						<ignoreTychoRepositories>true</ignoreTychoRepositories>

-						<includePackedArtifacts>true</includePackedArtifacts>

-					</configuration>

-				</plugin>

-				<plugin>

-					<groupId>org.eclipse.tycho</groupId>

-					<artifactId>tycho-compiler-plugin</artifactId>

-					<version>${tycho-version}</version>

-					<configuration>

-						<encoding>UTF-8</encoding>

-					</configuration>

-				</plugin>

-				<plugin>

-					<groupId>org.eclipse.tycho</groupId>

-					<artifactId>tycho-source-plugin</artifactId>

-					<version>${tycho-version}</version>

-					<configuration>

-						<encoding>UTF-8</encoding>

-					</configuration>

-					<executions>

-						<execution>

-							<id>plugin-source</id>

-							<goals>

-								<goal>plugin-source</goal>

-							</goals>

-						</execution>

-					</executions>

-				</plugin>

-				<plugin>

-					<groupId>org.eclipse.tycho</groupId>

-					<artifactId>tycho-packaging-plugin</artifactId>

-					<version>${tycho-version}</version>

-					<dependencies>

-						<dependency>

-							<groupId>org.eclipse.tycho.extras</groupId>

-							<artifactId>tycho-buildtimestamp-jgit</artifactId>

-							<version>${tycho-version}</version>

-						</dependency>

-						<dependency>

-							<groupId>org.eclipse.tycho.extras</groupId>

-							<artifactId>tycho-sourceref-jgit</artifactId>

-							<version>${tycho-extras-version}</version>

-						</dependency>

-					</dependencies>

-					<configuration>

-						<strictBinIncludes>false</strictBinIncludes>

-						<timestampProvider>jgit</timestampProvider>

-						<jgit.ignore>pom.xml</jgit.ignore>

-						<jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>

-						<sourceReferences>

-						    <generate>true</generate>

-						</sourceReferences>

-					</configuration>

-				</plugin>

-				<plugin>

-					<groupId>org.eclipse.tycho</groupId>

-					<artifactId>tycho-p2-repository-plugin</artifactId>

-					<version>${tycho-version}</version>

-					<configuration>

-						<finalName>${project.artifactId}</finalName>

-					</configuration>

-				</plugin>

-				<plugin>

-					<groupId>org.apache.maven.plugins</groupId>

-					<artifactId>maven-resources-plugin</artifactId>

-					<version>${maven-resources-version}</version>

-					<configuration>

-						<encoding>UTF-8</encoding>

-					</configuration>

-				</plugin>

-				<plugin>

-					<groupId>org.apache.maven.plugins</groupId>

-					<artifactId>maven-antrun-plugin</artifactId>

-					<version>${maven-antrun-version}</version>

-				</plugin>

-				<plugin>

-					<groupId>org.codehaus.gmaven</groupId>

-					<artifactId>gmaven-plugin</artifactId>

-					<version>${gmaven-version}</version>

-				</plugin>

-				<plugin>

-					<groupId>org.codehaus.mojo</groupId>

-					<artifactId>findbugs-maven-plugin</artifactId>

-					<version>${findbugs-version}</version>

-					<configuration>

-						<encoding>UTF-8</encoding>

-						<effort>Max</effort>

-						<threshold>Low</threshold>

-						<xmlOutput>true</xmlOutput>

-						<failOnError>false</failOnError>

-						<excludeFilterFile>${adminDir}/findbugs-exclude.xml</excludeFilterFile>

-					</configuration>

-					<executions>

-						<execution>

-							<goals>

-								<goal>check</goal>

-							</goals>

-						</execution>

-					</executions>

-				</plugin>

-				<plugin>      

-					<groupId>org.jacoco</groupId>

-					<artifactId>jacoco-maven-plugin</artifactId>

-					<version>${jacoco-version}</version>

-				</plugin>

-				

-				<!-- Pack200 and Signing -->

-				<plugin>

-					<groupId>org.eclipse.tycho.extras</groupId>

-					<artifactId>tycho-pack200a-plugin</artifactId>

-					<version>${tycho-version}</version>

-					<executions>

-						<execution>

-							<id>pack200-normalize</id>

-							<phase>verify</phase>

-							<goals>

-								<goal>normalize</goal>

-							</goals>

-						</execution>

-					</executions>

-				</plugin>

-				<plugin>

-					<groupId>org.eclipse.cbi.maven.plugins</groupId>

-					<artifactId>eclipse-jarsigner-plugin</artifactId>

-					<version>${eclipse-jarsigner-version}</version>

-					<executions>

-						<execution>

-							<id>sign</id>

-							<phase>verify</phase>

-							<goals>

-								<goal>sign</goal>

-							</goals>

-						</execution>

-					</executions>

-				</plugin>

-				<plugin>

-					<groupId>org.eclipse.tycho.extras</groupId>

-					<artifactId>tycho-pack200b-plugin</artifactId>

-					<version>${tycho-version}</version>

-					<executions>

-						<execution>

-							<id>pack200-pack</id>

-							<phase>verify</phase>

-							<goals>

-								<goal>pack</goal>

-							</goals>

-						</execution>

-					</executions>

-				</plugin>

-                <!-- Keep the tycho-p2-plugin after the tycho-pack200b-plugin -->

-                <!-- Tycho p2 metadata generation shall happen _after_ the JAR has been packed. -->

-				<plugin>

-					<groupId>org.eclipse.tycho</groupId>

-					<artifactId>tycho-p2-plugin</artifactId>

-					<version>${tycho-version}</version>

-					<!-- Signing appears to mess with the baseline repository logic.

-					     Disable the baseline repository until we've figured out what is going on. -->

-					<!--					

-					<configuration>

-						<baselineRepositories>

-							<repository>

-								<url>http://download.eclipse.org/tools/tcf/builds/${tcf-stream}/nightly</url>

-							</repository>

-						</baselineRepositories>

-					</configuration>

-					-->

-					<executions>

-						<execution>

-							<id>p2-metadata</id>

-							<phase>package</phase>

-							<goals>

-								<goal>p2-metadata</goal>

-							</goals>

-						</execution>

-					</executions>

-					<configuration>

-						<defaultP2Metadata>false</defaultP2Metadata>

-					</configuration>

-				</plugin>

-			</plugins>

-		</pluginManagement>

-	</build>

-</project>

+<?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>
+
+	<prerequisites>
+		<maven>3.0</maven>
+	</prerequisites>
+
+	<groupId>org.eclipse.tcf</groupId>
+	<artifactId>org.eclipse.tcf.maven-config</artifactId>
+	<version>1.4.0-SNAPSHOT</version> 
+	<packaging>pom</packaging>
+	<name>TCF and Target Explorer, Maven Configuration Master</name>
+
+	<licenses>
+		<license>
+			<name>Eclipse Public License</name>
+			<url>http://www.eclipse.org/legal/epl-v10.html</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<organization>
+		<name>Eclipse Foundation</name>
+		<url>http://www.eclipse.org/</url>
+	</organization>
+	
+	<properties>
+		<!-- Define version id's to be used in the plugins section -->
+		<tycho-version>0.22.0</tycho-version>
+		<tycho-extras-version>0.22.0</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>
+        <!-- Stick to Findbugs 2.5.2 until newer versions are supported by hudson.eclipse.org -->
+		<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>
+		<eclipse-jarsigner-version>1.1.2</eclipse-jarsigner-version>
+
+		<!-- Common global properties -->
+		<adminDir>${env.WORKSPACE}/admin</adminDir>
+		<tcf-stream>development</tcf-stream>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+		<!-- JaCoCo global properties -->
+		<jacoco.skip>false</jacoco.skip>
+		<jacoco.output>file</jacoco.output>
+		<jacoco.dumpOnExit>true</jacoco.dumpOnExit>
+
+		<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.git</tycho.scmUrl>
+
+		<!-- P2 repository URL's -->
+		<!-- Default: Eclipse 3.8.x (Juno), CDT 8.3.0 (Kepler), TM 4.0 (Mars) -->
+		<platform-site>http://download.eclipse.org/eclipse/updates/3.8</platform-site>
+		<license-site>http://download.eclipse.org/cbi/updates/license</license-site>
+        <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>
+		<rxtx-site>http://archive.eclipse.org/tm/updates/rxtx</rxtx-site>
+		<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository</orbit-site>
+		<swtbot-site>http://download.eclipse.org/technology/swtbot/releases/latest/</swtbot-site>
+  	</properties>
+
+	<repositories>
+        <repository>
+            <id>license-feature</id>
+            <url>${license-site}</url>
+            <layout>p2</layout>
+        </repository>	
+		<repository>
+			<id>platform</id>
+			<url>${platform-site}</url>
+			<layout>p2</layout>
+		</repository>
+		<repository>
+			<id>orbit</id>
+			<url>${orbit-site}</url>
+			<layout>p2</layout>
+		</repository>
+		<repository>
+			<id>cdt</id>
+			<url>${cdt-site}</url>
+			<layout>p2</layout>
+		</repository>
+		<repository>
+			<id>terminal</id>
+			<url>${terminal-site}</url>
+			<layout>p2</layout>
+		</repository>
+		<repository>
+			<id>tm</id>
+			<url>${tm-site}</url>
+			<layout>p2</layout>
+		</repository>
+		<repository>
+			<id>swtbot</id>
+			<url>${swtbot-site}</url>
+			<layout>p2</layout>
+		</repository>
+		<repository>
+			<id>ptp-remote</id>
+			<url>${ptp-remote-site}</url>
+			<layout>p2</layout>
+		</repository>
+		<repository>
+			<id>rxtx</id>
+			<url>${rxtx-site}</url>
+			<layout>p2</layout>
+		</repository>
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>sonatype</id>
+			<url>https://oss.sonatype.org/content/repositories/public</url>
+  			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</pluginRepository>
+		<pluginRepository>
+			<id>cbi</id>
+			<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>cbi-snapshots</id>
+			<url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<profiles>
+	    <profile>
+		    <!-- Eclipse 4.3.x (Kepler) -->
+		    <id>kepler</id>
+			
+			<properties>
+		        <platform-site>http://download.eclipse.org/eclipse/updates/4.3</platform-site>
+            </properties>
+		</profile>
+
+	    <profile>
+		    <!-- Eclipse 4.4 (Luna), CDT 8.4.0 (Luna) -->
+		    <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>
+            </properties>
+		</profile>
+
+	    <profile>
+		    <!-- Eclipse 4.5 (Mars), CDT 8.7.0 (Mars) -->
+		    <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>
+            </properties>
+			
+		</profile>
+
+	    <profile>
+		    <!-- Eclipse 4.6 (Neon), CDT 9.0.0 (Neon) -->
+		    <id>neon</id>
+			
+			<properties>
+		        <platform-site>http://download.eclipse.org/eclipse/updates/4.6milestones</platform-site>
+                <cdt-site>http://download.eclipse.org/tools/cdt/builds/neon/milestones</cdt-site>
+            </properties>
+			
+		</profile>
+    </profiles>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-maven-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-maven-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<extensions>true</extensions>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>target-platform-configuration</artifactId>
+					<version>${tycho-version}</version>
+					<configuration>
+						<environments>
+							<environment>
+								<os>linux</os>
+								<ws>gtk</ws>
+								<arch>x86</arch>
+							</environment>
+							<environment>
+								<os>linux</os>
+								<ws>gtk</ws>
+								<arch>x86_64</arch>
+							</environment>
+							<environment>
+								<os>win32</os>
+								<ws>win32</ws>
+								<arch>x86</arch>
+							</environment>
+							<environment>
+								<os>win32</os>
+								<ws>win32</ws>
+								<arch>x86_64</arch>
+							</environment>
+						</environments>
+						<resolver>p2</resolver>
+						<ignoreTychoRepositories>true</ignoreTychoRepositories>
+						<includePackedArtifacts>true</includePackedArtifacts>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-compiler-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<configuration>
+						<encoding>UTF-8</encoding>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-source-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<configuration>
+						<encoding>UTF-8</encoding>
+					</configuration>
+					<executions>
+						<execution>
+							<id>plugin-source</id>
+							<goals>
+								<goal>plugin-source</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-packaging-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.eclipse.tycho.extras</groupId>
+							<artifactId>tycho-buildtimestamp-jgit</artifactId>
+							<version>${tycho-version}</version>
+						</dependency>
+						<dependency>
+							<groupId>org.eclipse.tycho.extras</groupId>
+							<artifactId>tycho-sourceref-jgit</artifactId>
+							<version>${tycho-extras-version}</version>
+						</dependency>
+					</dependencies>
+					<configuration>
+						<strictBinIncludes>false</strictBinIncludes>
+						<timestampProvider>jgit</timestampProvider>
+						<jgit.ignore>pom.xml</jgit.ignore>
+						<jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
+						<sourceReferences>
+						    <generate>true</generate>
+						</sourceReferences>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-p2-repository-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<configuration>
+						<finalName>${project.artifactId}</finalName>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-resources-plugin</artifactId>
+					<version>${maven-resources-version}</version>
+					<configuration>
+						<encoding>UTF-8</encoding>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-antrun-plugin</artifactId>
+					<version>${maven-antrun-version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.gmaven</groupId>
+					<artifactId>gmaven-plugin</artifactId>
+					<version>${gmaven-version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>findbugs-maven-plugin</artifactId>
+					<version>${findbugs-version}</version>
+					<configuration>
+						<encoding>UTF-8</encoding>
+						<effort>Max</effort>
+						<threshold>Low</threshold>
+						<xmlOutput>true</xmlOutput>
+						<failOnError>false</failOnError>
+						<excludeFilterFile>${adminDir}/findbugs-exclude.xml</excludeFilterFile>
+					</configuration>
+					<executions>
+						<execution>
+							<goals>
+								<goal>check</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>      
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<version>${jacoco-version}</version>
+				</plugin>
+				
+				<!-- Pack200 and Signing -->
+				<plugin>
+					<groupId>org.eclipse.tycho.extras</groupId>
+					<artifactId>tycho-pack200a-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<executions>
+						<execution>
+							<id>pack200-normalize</id>
+							<phase>verify</phase>
+							<goals>
+								<goal>normalize</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.cbi.maven.plugins</groupId>
+					<artifactId>eclipse-jarsigner-plugin</artifactId>
+					<version>${eclipse-jarsigner-version}</version>
+					<executions>
+						<execution>
+							<id>sign</id>
+							<phase>verify</phase>
+							<goals>
+								<goal>sign</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho.extras</groupId>
+					<artifactId>tycho-pack200b-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<executions>
+						<execution>
+							<id>pack200-pack</id>
+							<phase>verify</phase>
+							<goals>
+								<goal>pack</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+                <!-- Keep the tycho-p2-plugin after the tycho-pack200b-plugin -->
+                <!-- Tycho p2 metadata generation shall happen _after_ the JAR has been packed. -->
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-p2-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<!-- Signing appears to mess with the baseline repository logic.
+					     Disable the baseline repository until we've figured out what is going on. -->
+					<!--					
+					<configuration>
+						<baselineRepositories>
+							<repository>
+								<url>http://download.eclipse.org/tools/tcf/builds/${tcf-stream}/nightly</url>
+							</repository>
+						</baselineRepositories>
+					</configuration>
+					-->
+					<executions>
+						<execution>
+							<id>p2-metadata</id>
+							<phase>package</phase>
+							<goals>
+								<goal>p2-metadata</goal>
+							</goals>
+						</execution>
+					</executions>
+					<configuration>
+						<defaultP2Metadata>false</defaultP2Metadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+</project>
diff --git a/admin/target-defs/eclipse-3.8.2-juno.target b/admin/target-defs/eclipse-3.8.2-juno.target
index faa134dca..1723758c5 100644
--- a/admin/target-defs/eclipse-3.8.2-juno.target
+++ b/admin/target-defs/eclipse-3.8.2-juno.target
@@ -46,8 +46,9 @@
 <repository location="http://download.eclipse.org/cbi/updates/license"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.remote.feature.group" version="1.1.1.201501261503"/>
-<repository location="http://download.eclipse.org/tools/ptp/builds/remote/1.1.1"/>
+<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>
 </target>
diff --git a/admin/target-defs/eclipse-4.3.x-kepler.target b/admin/target-defs/eclipse-4.3.x-kepler.target
index f2156a673..de029f7fd 100644
--- a/admin/target-defs/eclipse-4.3.x-kepler.target
+++ b/admin/target-defs/eclipse-4.3.x-kepler.target
@@ -47,8 +47,9 @@
 <repository location="http://download.eclipse.org/cbi/updates/license"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.remote.feature.group" version="1.1.1.201501261503"/>
-<repository location="http://download.eclipse.org/tools/ptp/builds/remote/1.1.1"/>
+<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>
 </target>
diff --git a/admin/target-defs/eclipse-4.4.x-luna.target b/admin/target-defs/eclipse-4.4.x-luna.target
index 60bc2a29b..7e028cd25 100644
--- a/admin/target-defs/eclipse-4.4.x-luna.target
+++ b/admin/target-defs/eclipse-4.4.x-luna.target
@@ -46,8 +46,9 @@
 <repository location="http://download.eclipse.org/releases/luna"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.remote.feature.group" version="1.1.1.201501261503"/>
-<repository location="http://download.eclipse.org/tools/ptp/builds/remote/1.1.1"/>
+<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>
 </target>
diff --git a/admin/target-defs/eclipse-4.5.x-mars.target b/admin/target-defs/eclipse-4.5.x-mars.target
new file mode 100644
index 000000000..937a7c75c
--- /dev/null
+++ b/admin/target-defs/eclipse-4.5.x-mars.target
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="Eclipse 4.5.x (Mars)" sequenceNumber="69">
+<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.v201305281000"/>
+<unit id="org.hamcrest.library" version="1.3.0.v201305281000"/>
+<unit id="org.eclipse.swtbot.ide.feature.group" version="2.3.0.201506081302"/>
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.3.0.201506081302"/>
+<unit id="org.eclipse.swtbot.feature.group" version="2.3.0.201506081302"/>
+<unit id="org.eclipse.swtbot.forms.feature.group" version="2.3.0.201506081302"/>
+<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.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/R20150821153341/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.0.I20150603-2000"/>
+<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.0.v20150603-2000"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.11.0.v20150601-0402"/>
+<repository location="http://download.eclipse.org/releases/mars"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" 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>
+</locations>
+</target>
diff --git a/admin/target-defs/eclipse-4.6.x-neon.target b/admin/target-defs/eclipse-4.6.x-neon.target
new file mode 100644
index 000000000..7b207bc3f
--- /dev/null
+++ b/admin/target-defs/eclipse-4.6.x-neon.target
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="Eclipse 4.6.x (Neon)" sequenceNumber="67">
+<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.v201305281000"/>
+<unit id="org.hamcrest.library" version="1.3.0.v201305281000"/>
+<unit id="org.eclipse.swtbot.ide.feature.group" version="2.3.0.201506081302"/>
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.3.0.201506081302"/>
+<unit id="org.eclipse.swtbot.feature.group" version="2.3.0.201506081302"/>
+<unit id="org.eclipse.swtbot.forms.feature.group" version="2.3.0.201506081302"/>
+<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.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/R20150821153341/repository"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.cdt.sdk.feature.group" version="8.8.0.201508171212"/>
+<repository location="http://download.eclipse.org/tools/cdt/builds/neon/milestones"/>
+</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.6.0.I20150805-2000"/>
+<unit id="org.eclipse.test.feature.group" version="3.7.0.v20150428-2048"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.6milestones"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.pde.feature.group" version="3.11.0.v20150805-2000"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20150817-0432"/>
+<repository location="http://download.eclipse.org/releases/neon"/>
+</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>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" 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>
+</locations>
+</target>