From 8fb073cdeec017fd5f792471b8cdd96555fd24ae Mon Sep 17 00:00:00 2001
From: Quentin Le Menez
Date: Mon, 3 Sep 2018 10:28:43 +0200
Subject: [Releng] [TPD] Update target platforms

- Update TPD dependency due to the mogration to eclipse-cbi @see Bug 538414

Change-Id: Ie2ae1767fad4f514f7c730242aee42b7b2125327
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
---
 ...clipse.papyrus.main.tests.eclipse.target.target | 10 ++--
 ...lipse.papyrus.main.tests.portable.target.target | 10 ++--
 ....eclipse.papyrus.main.tests.portable.target.tpd |  2 +-
 .../org.eclipse.papyrus.main.eclipse.target.target |  6 +--
 ...org.eclipse.papyrus.main.portable.target.target |  6 +--
 .../org.eclipse.papyrus.main.portable.target.tpd   |  2 +-
 .../org.eclipse.papyrus.rcp.eclipse.target.target  | 22 ++++----
 .../org.eclipse.papyrus.rcp.portable.target.target | 22 ++++----
 .../org.eclipse.papyrus.rcp.portable.target.tpd    |  6 +--
 ...apyrus.toolsmiths.eclipse.targetplatform.target | 54 ++++++++++----------
 ...pyrus.toolsmiths.portable.targetplatform.target | 54 ++++++++++----------
 ....papyrus.toolsmiths.portable.targetplatform.tpd | 59 +++++++++++-----------
 12 files changed, 127 insertions(+), 126 deletions(-)

diff --git a/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target b/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
index e838371d242..8e0fe5f3d88 100755
--- a/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
+++ b/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Tests" sequenceNumber="1535525805">
+<target name="Papyrus Tests" sequenceNumber="1535963132">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.9.0.v20180828-0645"/>
@@ -17,8 +17,8 @@
       <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.4milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180823-0831"/>
-      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.9milestones/S-4.9M3-201808230450/"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180830-1030"/>
+      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.9milestones/S-4.9RC1-201808301030/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.6.0.v20180827-0709"/>
@@ -99,8 +99,8 @@
       <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/I20180528174014/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.3.201805161152"/>
-      <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201805161152/"/>
+      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.4.201806221350"/>
+      <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201806221350/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.codegen" version="2.11.0.201509291144"/>
diff --git a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target b/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
index 5f48d43a2df..bb198114bef 100755
--- a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
+++ b/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Tests" sequenceNumber="1535525805">
+<target name="Papyrus Tests" sequenceNumber="1535963132">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.9.0.v20180828-0645"/>
@@ -17,8 +17,8 @@
       <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.4milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180823-0831"/>
-      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.9milestones/S-4.9M3-201808230450/"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180830-1030"/>
+      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.9milestones/S-4.9RC1-201808301030/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.6.0.v20180827-0709"/>
@@ -99,8 +99,8 @@
       <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/I20180528174014/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.3.201805161152"/>
-      <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201805161152/"/>
+      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.4.201806221350"/>
+      <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201806221350/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.codegen" version="2.11.0.201509291144"/>
diff --git a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd b/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd
index 2e1269afd08..2fffbc6818f 100644
--- a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd
+++ b/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd
@@ -4,7 +4,7 @@ include "../../../main/targetPlatform/portable/org.eclipse.papyrus.main.portable
 
 //updateFrom("EMF COMPARE",0)
 
-location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201805161152/" {
+location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201806221350/" {
 	org.eclipse.emf.compare.source.feature.group
 }
 
diff --git a/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target b/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target
index 78f1705c056..7cd68890e57 100755
--- a/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target
+++ b/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Main" sequenceNumber="1535525805">
+<target name="Papyrus Main" sequenceNumber="1535963132">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.9.0.v20180828-0645"/>
@@ -17,8 +17,8 @@
       <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.4milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180823-0831"/>
-      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.9milestones/S-4.9M3-201808230450/"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180830-1030"/>
+      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.9milestones/S-4.9RC1-201808301030/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.6.0.v20180827-0709"/>
diff --git a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target
index 91c825c35b2..18f5e29fda0 100755
--- a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target
+++ b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Main" sequenceNumber="1535525805">
+<target name="Papyrus Main" sequenceNumber="1535963132">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.9.0.v20180828-0645"/>
@@ -17,8 +17,8 @@
       <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.4milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180823-0831"/>
-      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.9milestones/S-4.9M3-201808230450/"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180830-1030"/>
+      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.9milestones/S-4.9RC1-201808301030/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.6.0.v20180827-0709"/>
diff --git a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
index 5b922aaa374..82080d46683 100755
--- a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
+++ b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
@@ -24,7 +24,7 @@ location uml "http://download.eclipse.org/modeling/mdt/uml2/updates/5.4milestone
 
 //updateFrom("Eclipse",0)
 
-location platform "http://download.eclipse.org/eclipse/updates/4.9milestones/S-4.9M3-201808230450/" {
+location platform "http://download.eclipse.org/eclipse/updates/4.9milestones/S-4.9RC1-201808301030/" {
 	org.eclipse.sdk.feature.group
 }
 
diff --git a/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target b/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
index 6133ab78c33..08fb22ff08d 100755
--- a/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
+++ b/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus RCP" sequenceNumber="1535525811">
+<target name="Papyrus RCP" sequenceNumber="1535963135">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.9.0.v20180828-0645"/>
@@ -91,15 +91,15 @@
       <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/I20180528174014/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="5.0.0.201806131550-r"/>
-      <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/updates-5.0"/>
+      <unit id="org.eclipse.egit.feature.group" version="5.1.0.201808281540-m3"/>
+      <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/staging/v5.1.0.201808281540-m3"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.9.0.v20180821-1411"/>
-      <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.200.v20180823-0450"/>
-      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.100.v20180822-1415"/>
-      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180823-0831"/>
-      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.9milestones/S-4.9M3-201808230450/"/>
+      <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.9.0.v20180823-1503"/>
+      <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.200.v20180830-1030"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.100.v20180827-1352"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180830-1030"/>
+      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.9milestones/S-4.9RC1-201808301030/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.24.0.v20170629-2230"/>
@@ -111,9 +111,9 @@
       <repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.24.0/v20180613-1723"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.3.201805161152"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.3.201805161152"/>
-      <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201805161152/"/>
+      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.4.201806221350"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.4.201806221350"/>
+      <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201806221350/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xsd.sdk.feature.group" version="2.15.0.v20180722-1116"/>
diff --git a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
index bbc2f50174c..3898b7e2258 100755
--- a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
+++ b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus RCP" sequenceNumber="1535525811">
+<target name="Papyrus RCP" sequenceNumber="1535963135">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.9.0.v20180828-0645"/>
@@ -91,15 +91,15 @@
       <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/I20180528174014/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="5.0.0.201806131550-r"/>
-      <repository id="egit" location="http://download.eclipse.org/egit/updates-5.0"/>
+      <unit id="org.eclipse.egit.feature.group" version="5.1.0.201808281540-m3"/>
+      <repository id="egit" location="http://download.eclipse.org/egit/staging/v5.1.0.201808281540-m3"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.9.0.v20180821-1411"/>
-      <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.200.v20180823-0450"/>
-      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.100.v20180822-1415"/>
-      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180823-0831"/>
-      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.9milestones/S-4.9M3-201808230450/"/>
+      <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.9.0.v20180823-1503"/>
+      <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.200.v20180830-1030"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.100.v20180827-1352"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180830-1030"/>
+      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.9milestones/S-4.9RC1-201808301030/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.24.0.v20170629-2230"/>
@@ -111,9 +111,9 @@
       <repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.24.0/v20180613-1723"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.3.201805161152"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.3.201805161152"/>
-      <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201805161152/"/>
+      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.4.201806221350"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.4.201806221350"/>
+      <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201806221350/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xsd.sdk.feature.group" version="2.15.0.v20180722-1116"/>
diff --git a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd
index 40676be9581..6a066fdca17 100644
--- a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd
+++ b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd
@@ -6,13 +6,13 @@ include "../../../main/targetPlatform/portable/org.eclipse.papyrus.main.portable
 /*** Updates from the Simrel repository ***/
 
 //updateFrom("EGIT",0)
-location egit "http://download.eclipse.org/egit/updates-5.0" {
+location egit "http://download.eclipse.org/egit/staging/v5.1.0.201808281540-m3" {
 	org.eclipse.egit.feature.group
 }
 
 //updateFrom("Eclipse",0)
 
-location platform "http://download.eclipse.org/eclipse/updates/4.9milestones/S-4.9M3-201808230450/" {
+location platform "http://download.eclipse.org/eclipse/updates/4.9milestones/S-4.9RC1-201808301030/" {
 	org.eclipse.e4.core.tools.feature.feature.group 
 	org.eclipse.rcp.configuration.feature.group 
 	org.eclipse.equinox.executable.feature.group 
@@ -31,7 +31,7 @@ location mylyn "http://download.eclipse.org/mylyn/drops/3.24.0/v20180613-1723" {
 
 //updateFrom("EMF COMPARE",0) 
 
-location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201805161152/" {
+location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201806221350/" {
 	org.eclipse.emf.compare.source.feature.group
 	org.eclipse.emf.compare.ide.ui.source.feature.group
 }
diff --git a/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target b/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target
index 61eddfcd448..c422fed558a 100755
--- a/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target
+++ b/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Toolsmiths" sequenceNumber="1535525815">
+<target name="Papyrus Toolsmiths" sequenceNumber="1535963141">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.9.0.v20180828-0645"/>
@@ -17,8 +17,8 @@
       <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.4milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180823-0831"/>
-      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.9milestones/S-4.9M3-201808230450/"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180830-1030"/>
+      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.9milestones/S-4.9RC1-201808301030/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.6.0.v20180827-0709"/>
@@ -98,6 +98,23 @@
       <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>
       <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/I20180528174014/repository"/>
     </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="fr.obeo.releng.targetplatform-feature.feature.group" version="2.1.1.201410251450"/>
+      <repository id="tpd" location="https://dl.bintray.com/mbarbero/fr.obeo.releng.targetplatform/latest/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.cbi.p2repo.aggregator.engine.feature.source.feature.group" version="0.0.0"/>
+      <repository id="cbiAggregator" location="file:/home/data/httpd/download.eclipse.org/cbi/updates/aggregator/ide/4.8/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.codegen" version="2.11.0.201509291144"/>
+      <unit id="org.eclipse.gmf.codegen.ui" version="1.3.0.201509291144"/>
+      <unit id="org.eclipse.gmf.codegen.xtend" version="1.0.0.201509291144"/>
+      <unit id="org.eclipse.gmf.codegen.xtend.ui" version="1.0.0.201509291144"/>
+      <repository id="gmfTooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
+    </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.oomph.version.feature.group" version="1.10.0.v20180706-1242"/>
       <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.10.0.v20180706-1242"/>
@@ -112,41 +129,24 @@
       <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.10.0.v20180706-1242"/>
       <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.10.0.v20180706-1242"/>
       <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.10.0.v20180706-1242"/>
-      <unit id="org.eclipse.oomph.p2.feature.group" version="1.10.0.v20180712-0540"/>
-      <unit id="org.eclipse.oomph.setup.feature.group" version="1.10.0.v20180714-0556"/>
+      <unit id="org.eclipse.oomph.p2.feature.group" version="1.10.0.v20180829-1028"/>
+      <unit id="org.eclipse.oomph.setup.feature.group" version="1.10.0.v20180829-1028"/>
       <unit id="org.eclipse.oomph.preferences.feature.group" version="1.10.0.v20180706-1242"/>
-      <repository id="oomph" location="file:/home/data/httpd/download.eclipse.org/oomph/drops/milestone/S20180807-142759-1.10.0-M1"/>
+      <repository id="oomph" location="file:/home/data/httpd/download.eclipse.org/oomph/drops/milestone/S20180829-063443-1.10.0-M2"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/updates-5.0"/>
+      <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/staging/v5.1.0.201808281540-m3"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="m2e" location="file:/home/data/httpd/download.eclipse.org/technology/m2e/milestones/1.9/1.9.1.20180823-0040"/>
+      <repository id="m2e" location="file:/home/data/httpd/download.eclipse.org/technology/m2e/milestones/1.9/1.9.1.20180829-1411"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.24.0/v20180613-1723"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.3.201805161152"/>
-      <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201805161152/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="fr.obeo.releng.targetplatform-feature.feature.group" version="2.1.1.201410251450"/>
-      <repository id="tpd" location="http://mbarbero.github.io/fr.obeo.releng.targetplatform/p2/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.cbi.p2repo.aggregator.engine.feature.source.feature.group" version="0.0.0"/>
-      <repository id="cbiAggregator" location="file:/home/data/httpd/download.eclipse.org/cbi/updates/aggregator/ide/4.8/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.codegen" version="2.11.0.201509291144"/>
-      <unit id="org.eclipse.gmf.codegen.ui" version="1.3.0.201509291144"/>
-      <unit id="org.eclipse.gmf.codegen.xtend" version="1.0.0.201509291144"/>
-      <unit id="org.eclipse.gmf.codegen.xtend.ui" version="1.0.0.201509291144"/>
-      <repository id="gmfTooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
+      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.4.201806221350"/>
+      <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201806221350/"/>
     </location>
   </locations>
 </target>
diff --git a/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target b/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target
index 0f7c5e87d24..4422dad4abd 100755
--- a/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target
+++ b/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Toolsmiths" sequenceNumber="1535525815">
+<target name="Papyrus Toolsmiths" sequenceNumber="1535963141">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.9.0.v20180828-0645"/>
@@ -17,8 +17,8 @@
       <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.4milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180823-0831"/>
-      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.9milestones/S-4.9M3-201808230450/"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180830-1030"/>
+      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.9milestones/S-4.9RC1-201808301030/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.6.0.v20180827-0709"/>
@@ -98,6 +98,23 @@
       <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>
       <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/I20180528174014/repository"/>
     </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="fr.obeo.releng.targetplatform-feature.feature.group" version="2.1.1.201410251450"/>
+      <repository id="tpd" location="https://dl.bintray.com/mbarbero/fr.obeo.releng.targetplatform/latest/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.cbi.p2repo.aggregator.engine.feature.source.feature.group" version="0.0.0"/>
+      <repository id="cbiAggregator" location="http://download.eclipse.org/cbi/updates/aggregator/ide/4.8/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.codegen" version="2.11.0.201509291144"/>
+      <unit id="org.eclipse.gmf.codegen.ui" version="1.3.0.201509291144"/>
+      <unit id="org.eclipse.gmf.codegen.xtend" version="1.0.0.201509291144"/>
+      <unit id="org.eclipse.gmf.codegen.xtend.ui" version="1.0.0.201509291144"/>
+      <repository id="gmfTooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
+    </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.oomph.version.feature.group" version="1.10.0.v20180706-1242"/>
       <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.10.0.v20180706-1242"/>
@@ -112,41 +129,24 @@
       <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.10.0.v20180706-1242"/>
       <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.10.0.v20180706-1242"/>
       <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.10.0.v20180706-1242"/>
-      <unit id="org.eclipse.oomph.p2.feature.group" version="1.10.0.v20180712-0540"/>
-      <unit id="org.eclipse.oomph.setup.feature.group" version="1.10.0.v20180714-0556"/>
+      <unit id="org.eclipse.oomph.p2.feature.group" version="1.10.0.v20180829-1028"/>
+      <unit id="org.eclipse.oomph.setup.feature.group" version="1.10.0.v20180829-1028"/>
       <unit id="org.eclipse.oomph.preferences.feature.group" version="1.10.0.v20180706-1242"/>
-      <repository id="oomph" location="http://download.eclipse.org/oomph/drops/milestone/S20180807-142759-1.10.0-M1"/>
+      <repository id="oomph" location="http://download.eclipse.org/oomph/drops/milestone/S20180829-063443-1.10.0-M2"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="egit" location="http://download.eclipse.org/egit/updates-5.0"/>
+      <repository id="egit" location="http://download.eclipse.org/egit/staging/v5.1.0.201808281540-m3"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="m2e" location="http://download.eclipse.org/technology/m2e/milestones/1.9/1.9.1.20180823-0040"/>
+      <repository id="m2e" location="http://download.eclipse.org/technology/m2e/milestones/1.9/1.9.1.20180829-1411"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.24.0/v20180613-1723"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.3.201805161152"/>
-      <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201805161152/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="fr.obeo.releng.targetplatform-feature.feature.group" version="2.1.1.201410251450"/>
-      <repository id="tpd" location="http://mbarbero.github.io/fr.obeo.releng.targetplatform/p2/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.cbi.p2repo.aggregator.engine.feature.source.feature.group" version="0.0.0"/>
-      <repository id="cbiAggregator" location="http://download.eclipse.org/cbi/updates/aggregator/ide/4.8/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.codegen" version="2.11.0.201509291144"/>
-      <unit id="org.eclipse.gmf.codegen.ui" version="1.3.0.201509291144"/>
-      <unit id="org.eclipse.gmf.codegen.xtend" version="1.0.0.201509291144"/>
-      <unit id="org.eclipse.gmf.codegen.xtend.ui" version="1.0.0.201509291144"/>
-      <repository id="gmfTooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
+      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.4.201806221350"/>
+      <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201806221350/"/>
     </location>
   </locations>
 </target>
diff --git a/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd b/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd
index 6b26f6a3455..4320977b63b 100644
--- a/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd
+++ b/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd
@@ -3,11 +3,37 @@ target "Papyrus Toolsmiths" with requirements source
 include "../../../main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd"
 
 
+/*** Manual referencing ***/
+
+//manualUpdate
+// This will need to be changed as soon as the new build is available @see Bug 538414
+location tpd "https://dl.bintray.com/mbarbero/fr.obeo.releng.targetplatform/latest/" {
+    fr.obeo.releng.targetplatform-feature.feature.group
+}
+
+//manualUpdate 
+
+location cbiAggregator "http://download.eclipse.org/cbi/updates/aggregator/ide/4.8/" {
+    org.eclipse.cbi.p2repo.aggregator.editor.feature.source.feature.group lazy
+    org.eclipse.cbi.p2repo.aggregator.editor.feature.feature.group lazy
+    org.eclipse.cbi.p2repo.aggregator.engine.feature.source.feature.group lazy
+}
+
+//manualUpdate
+
+location gmfTooling "http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a" {
+    org.eclipse.gmf.codegen
+    org.eclipse.gmf.codegen.ui
+    org.eclipse.gmf.codegen.xtend
+    org.eclipse.gmf.codegen.xtend.ui
+}
+
+
 /*** Updates from the Simrel repository ***/
 
 //updateFrom("oomph",0) 
 
-location oomph "http://download.eclipse.org/oomph/drops/milestone/S20180807-142759-1.10.0-M1" {
+location oomph "http://download.eclipse.org/oomph/drops/milestone/S20180829-063443-1.10.0-M2" {
 	org.eclipse.oomph.version.feature.group
 	org.eclipse.oomph.setup.workingsets.feature.group
 	org.eclipse.oomph.projectconfig.feature.group
@@ -28,11 +54,11 @@ location oomph "http://download.eclipse.org/oomph/drops/milestone/S20180807-1427
 
 //updateFrom("EGIT",0) 
 
-location egit "http://download.eclipse.org/egit/updates-5.0" // oomph
+location egit "http://download.eclipse.org/egit/staging/v5.1.0.201808281540-m3" // oomph
 
 //updateFrom("m2e",0)
 
-location m2e "http://download.eclipse.org/technology/m2e/milestones/1.9/1.9.1.20180823-0040" // oomph
+location m2e "http://download.eclipse.org/technology/m2e/milestones/1.9/1.9.1.20180829-1411" // oomph
 
 //updateFrom("Mylyn",0)
 
@@ -40,32 +66,7 @@ location mylyn "http://download.eclipse.org/mylyn/drops/3.24.0/v20180613-1723" /
 
 //updateFrom("EMF COMPARE",0)
 
-location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201805161152/" {
+location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201806221350/" {
 	org.eclipse.emf.compare.ide.ui.feature.group lazy
 	org.eclipse.emf.compare.source.feature.group
-}
-
-/*** Manual referencing ***/
-
-//manualUpdate
-
-location tpd "http://mbarbero.github.io/fr.obeo.releng.targetplatform/p2/" {
-	fr.obeo.releng.targetplatform-feature.feature.group
-}
-
-//manualUpdate 
-
-location cbiAggregator "http://download.eclipse.org/cbi/updates/aggregator/ide/4.8/" {
-	org.eclipse.cbi.p2repo.aggregator.editor.feature.source.feature.group lazy
-	org.eclipse.cbi.p2repo.aggregator.editor.feature.feature.group lazy
-	org.eclipse.cbi.p2repo.aggregator.engine.feature.source.feature.group lazy
-}
-
-//manualUpdate
-
-location gmfTooling "http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a" {
-	org.eclipse.gmf.codegen
-	org.eclipse.gmf.codegen.ui
-	org.eclipse.gmf.codegen.xtend
-	org.eclipse.gmf.codegen.xtend.ui
 }
\ No newline at end of file
-- 
cgit v1.2.3