From 013db6e0b9c451a898155c00a2f354dbe1fc1c11 Mon Sep 17 00:00:00 2001
From: Uwe Stieber <uwe.stieber@windriver.com>
Date: Tue, 11 Aug 2015 13:05:34 +0200
Subject: [PATCH] Releng: Use released versions of Eclipse Mars for TM Terminal
 build

---
 admin/pom-config.xml                        | 18 ++++++++++++------
 admin/target-defs/eclipse-4.5.x-mars.target |  4 ++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/admin/pom-config.xml b/admin/pom-config.xml
index 36275f69704..82a0b9ea591 100644
--- a/admin/pom-config.xml
+++ b/admin/pom-config.xml
@@ -59,11 +59,12 @@
         
         <!-- Set up the default target platform to build against -->
         <license-site>http://download.eclipse.org/cbi/updates/license</license-site>
-        <platform-site>http://download.eclipse.org/eclipse/updates/${sdk-version}milestones</platform-site>
+        <platform-update-site>http://download.eclipse.org/eclipse/updates/${sdk-version}</platform-update-site>
+        <platform-release-site>http://download.eclipse.org/releases/mars</platform-release-site>
 		<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/</orbit-site>
-        <cdt-site>http://download.eclipse.org/tools/cdt/builds/mars/milestones</cdt-site>
-        <rse-site>http://download.eclipse.org/tm/updates/4.0milestones</rse-site>
-        <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/mars/milestones</remote-site>
+        <cdt-site>http://download.eclipse.org/tools/cdt/releases/8.7</cdt-site>
+        <rse-site>http://download.eclipse.org/tm/updates/4.0</rse-site>
+        <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/2.0.0</remote-site>
         <swtbot-site>http://download.eclipse.org/technology/swtbot/releases/latest/</swtbot-site>
         <rxtx-site>http://archive.eclipse.org/tm/updates/rxtx</rxtx-site>
       </properties>
@@ -75,8 +76,13 @@
             <layout>p2</layout>
         </repository>    
         <repository>
-            <id>platform</id>
-            <url>${platform-site}</url>
+            <id>platform-update</id>
+            <url>${platform-update-site}</url>
+            <layout>p2</layout>
+        </repository>
+        <repository>
+            <id>platform-release</id>
+            <url>${platform-release-site}</url>
             <layout>p2</layout>
         </repository>
         <repository>
diff --git a/admin/target-defs/eclipse-4.5.x-mars.target b/admin/target-defs/eclipse-4.5.x-mars.target
index d30c17a8e50..ee854f512cc 100644
--- a/admin/target-defs/eclipse-4.5.x-mars.target
+++ b/admin/target-defs/eclipse-4.5.x-mars.target
@@ -10,8 +10,8 @@
 <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.rse.sdk.feature.group" version="3.7.0.201504291424"/>
-<repository location="http://download.eclipse.org/tm/updates/4.0milestones"/>
+<unit id="org.eclipse.rse.sdk.feature.group" version="3.7.0.201505221634"/>
+<repository location="http://download.eclipse.org/tm/updates/4.0"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.test.feature.group" version="3.7.0.v20150428-2048"/>