Bug 545631 - [Releng] Update the targets for 2019-06 R

Change-Id: I86e934071f2a4ecb7e7171872f8c70a5813df082
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>

13 files changed, 102 insertions, 102 deletions

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 215a052291c..38f03ed421e 100644
--- 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/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Main" sequenceNumber="1560352546">
+<target name="Papyrus Main" sequenceNumber="1561014276">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -47,7 +47,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sdk.feature.group" version="4.12.0.v20190605-1801"/>
-      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.12milestones/S-4.12RC2-201906051800/"/>
+      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.12/R-4.12-201906051800/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.9.0.v20190603-1146"/>
@@ -55,12 +55,12 @@
       <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.8.0/S201906031146"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.ui.feature.group" version="2.18.0.v20190528-0716"/>
-      <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201905280716"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.ui.feature.group" version="2.18.0.v20190603-1516"/>
+      <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/releases/2.18.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.10.0"/>
@@ -68,7 +68,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-      <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.RC1a-20190604044041/repository/"/>
+      <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.RC2-20190612230649/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.1.201905141505"/>
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 a8b117dc32d..95d91e52489 100644
--- 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/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Main" sequenceNumber="1560352546">
+<target name="Papyrus Main" sequenceNumber="1561014276">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -47,7 +47,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sdk.feature.group" version="4.12.0.v20190605-1801"/>
-      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.12milestones/S-4.12RC2-201906051800/"/>
+      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.12/R-4.12-201906051800/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.9.0.v20190603-1146"/>
@@ -55,12 +55,12 @@
       <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.8.0/S201906031146"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.ui.feature.group" version="2.18.0.v20190528-0716"/>
-      <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201905280716"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.ui.feature.group" version="2.18.0.v20190603-1516"/>
+      <repository id="xtext" location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.18.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.10.0"/>
@@ -68,7 +68,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-      <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.RC1a-20190604044041/repository/"/>
+      <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.RC2-20190612230649/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.1.201905141505"/>
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 31f5c58f1b4..22053878f76 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
@@ -69,7 +69,7 @@ location uml "http://download.eclipse.org/modeling/mdt/uml2/updates/5.5" {
 
 //updateFrom("Eclipse",0)
 
-location platform "http://download.eclipse.org/eclipse/updates/4.12milestones/S-4.12RC2-201906051800/" {
+location platform "http://download.eclipse.org/eclipse/updates/4.12/R-4.12-201906051800/" {
 	org.eclipse.sdk.feature.group
 }
 
@@ -82,7 +82,7 @@ location ocl "https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6
 
 //updateFrom("Xtext, Xtend",0)
 
-location xtext "https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201905280716" {
+location xtext "http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.18.0" {
 	org.eclipse.xtext.sdk.feature.group
 	org.eclipse.xtend.sdk.feature.group
 	org.eclipse.xtext.redist.feature.group
@@ -98,7 +98,7 @@ location mwe "http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.1
 
 //updateFrom("WebTools 3.14 for Simrel 2019-06",0) 
 
-location webtools "https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.RC1a-20190604044041/repository/" {
+location webtools "https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.RC2-20190612230649/repository/" {
 	org.eclipse.wst.xml_ui.feature.feature.group lazy 
 }
 
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 fca1351cc05..50bf4ffc60c 100644
--- 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/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus RCP" sequenceNumber="1560352546">
+<target name="Papyrus RCP" sequenceNumber="1561014276">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -51,12 +51,12 @@
       <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.8.0/S201906031146"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.ui.feature.group" version="2.18.0.v20190528-0716"/>
-      <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201905280716"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.ui.feature.group" version="2.18.0.v20190603-1516"/>
+      <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/releases/2.18.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.10.0"/>
@@ -64,7 +64,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-      <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.RC1a-20190604044041/repository/"/>
+      <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.RC2-20190612230649/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.1.201905141505"/>
@@ -91,15 +91,15 @@
       <repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="5.4.0.201905221418-m3"/>
-      <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/staging/v5.4.0.201905221418-m3"/>
+      <unit id="org.eclipse.egit.feature.group" version="5.4.0.201906121030-r"/>
+      <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/updates-5.4"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.12.0.v20190505-1221"/>
       <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.500.v20190605-1800"/>
       <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.400.v20190515-0925"/>
       <unit id="org.eclipse.sdk.feature.group" version="4.12.0.v20190605-1801"/>
-      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.12milestones/S-4.12RC2-201906051800/"/>
+      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.12/R-4.12-201906051800/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.24.2.v20180905-0014"/>
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 02f6f0bac35..6e1e6f57c31 100644
--- 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/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus RCP" sequenceNumber="1560352546">
+<target name="Papyrus RCP" sequenceNumber="1561014276">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -51,12 +51,12 @@
       <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.8.0/S201906031146"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.ui.feature.group" version="2.18.0.v20190528-0716"/>
-      <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201905280716"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.ui.feature.group" version="2.18.0.v20190603-1516"/>
+      <repository id="xtext" location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.18.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.10.0"/>
@@ -64,7 +64,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-      <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.RC1a-20190604044041/repository/"/>
+      <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.RC2-20190612230649/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.1.201905141505"/>
@@ -91,15 +91,15 @@
       <repository id="gef" location="http://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="5.4.0.201905221418-m3"/>
-      <repository id="egit" location="http://download.eclipse.org/egit/staging/v5.4.0.201905221418-m3"/>
+      <unit id="org.eclipse.egit.feature.group" version="5.4.0.201906121030-r"/>
+      <repository id="egit" location="http://download.eclipse.org/egit/updates-5.4"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.12.0.v20190505-1221"/>
       <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.500.v20190605-1800"/>
       <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.400.v20190515-0925"/>
       <unit id="org.eclipse.sdk.feature.group" version="4.12.0.v20190605-1801"/>
-      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.12milestones/S-4.12RC2-201906051800/"/>
+      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.12/R-4.12-201906051800/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.24.2.v20180905-0014"/>
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 325eaaeb247..3306dcb914f 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
@@ -7,13 +7,13 @@ include "../../../main/targetPlatform/portable/org.eclipse.papyrus.main.portable
 
 //updateFrom("EGIT",0)
 
-location egit "http://download.eclipse.org/egit/staging/v5.4.0.201905221418-m3" {
+location egit "http://download.eclipse.org/egit/updates-5.4" {
 	org.eclipse.egit.feature.group
 }
 
 //updateFrom("Eclipse",0)
 
-location platform "http://download.eclipse.org/eclipse/updates/4.12milestones/S-4.12RC2-201906051800/" {
+location platform "http://download.eclipse.org/eclipse/updates/4.12/R-4.12-201906051800/" {
 	org.eclipse.e4.core.tools.feature.feature.group 
 	org.eclipse.rcp.configuration.feature.group
 	org.eclipse.equinox.executable.feature.group
diff --git a/releng/tests/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target b/releng/tests/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target
index 54b13b7c95d..30c4782de6a 100644
--- a/releng/tests/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target
+++ b/releng/tests/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus CDO Tests" sequenceNumber="1560352547">
+<target name="Papyrus CDO Tests" sequenceNumber="1561014286">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -47,7 +47,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sdk.feature.group" version="4.12.0.v20190605-1801"/>
-      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.12milestones/S-4.12RC2-201906051800/"/>
+      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.12/R-4.12-201906051800/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.9.0.v20190603-1146"/>
@@ -55,12 +55,12 @@
       <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.8.0/S201906031146"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.ui.feature.group" version="2.18.0.v20190528-0716"/>
-      <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201905280716"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.ui.feature.group" version="2.18.0.v20190603-1516"/>
+      <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/releases/2.18.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.10.0"/>
@@ -68,7 +68,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-      <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.RC1a-20190604044041/repository/"/>
+      <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.RC2-20190612230649/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.1.201905141505"/>
diff --git a/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target b/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target
index 6acf03c4600..8b02af36c27 100644
--- a/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target
+++ b/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus CDO Tests" sequenceNumber="1560352547">
+<target name="Papyrus CDO Tests" sequenceNumber="1561014286">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -47,7 +47,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sdk.feature.group" version="4.12.0.v20190605-1801"/>
-      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.12milestones/S-4.12RC2-201906051800/"/>
+      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.12/R-4.12-201906051800/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.9.0.v20190603-1146"/>
@@ -55,12 +55,12 @@
       <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.8.0/S201906031146"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.ui.feature.group" version="2.18.0.v20190528-0716"/>
-      <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201905280716"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.ui.feature.group" version="2.18.0.v20190603-1516"/>
+      <repository id="xtext" location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.18.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.10.0"/>
@@ -68,7 +68,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-      <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.RC1a-20190604044041/repository/"/>
+      <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.RC2-20190612230649/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.1.201905141505"/>
diff --git a/releng/tests/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target b/releng/tests/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
index d9323aad8c7..bc1e347df85 100644
--- a/releng/tests/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
+++ b/releng/tests/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/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Tests" sequenceNumber="1560352547">
+<target name="Papyrus Tests" sequenceNumber="1561014286">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -47,7 +47,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sdk.feature.group" version="4.12.0.v20190605-1801"/>
-      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.12milestones/S-4.12RC2-201906051800/"/>
+      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.12/R-4.12-201906051800/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.9.0.v20190603-1146"/>
@@ -55,12 +55,12 @@
       <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.8.0/S201906031146"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.ui.feature.group" version="2.18.0.v20190528-0716"/>
-      <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201905280716"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.ui.feature.group" version="2.18.0.v20190603-1516"/>
+      <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/releases/2.18.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.10.0"/>
@@ -68,7 +68,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-      <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.RC1a-20190604044041/repository/"/>
+      <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.RC2-20190612230649/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.1.201905141505"/>
diff --git a/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target b/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
index 9b4f2d3c956..8eddd7ee5b1 100644
--- a/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
+++ b/releng/tests/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/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Tests" sequenceNumber="1560352547">
+<target name="Papyrus Tests" sequenceNumber="1561014286">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -47,7 +47,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sdk.feature.group" version="4.12.0.v20190605-1801"/>
-      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.12milestones/S-4.12RC2-201906051800/"/>
+      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.12/R-4.12-201906051800/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.9.0.v20190603-1146"/>
@@ -55,12 +55,12 @@
       <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.8.0/S201906031146"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.ui.feature.group" version="2.18.0.v20190528-0716"/>
-      <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201905280716"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.ui.feature.group" version="2.18.0.v20190603-1516"/>
+      <repository id="xtext" location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.18.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.10.0"/>
@@ -68,7 +68,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-      <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.RC1a-20190604044041/repository/"/>
+      <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.RC2-20190612230649/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.1.201905141505"/>
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 1d4056b0fbc..c960dc35b20 100644
--- 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/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Toolsmiths" sequenceNumber="1560352553">
+<target name="Papyrus Toolsmiths" sequenceNumber="1561014302">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -47,7 +47,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sdk.feature.group" version="4.12.0.v20190605-1801"/>
-      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.12milestones/S-4.12RC2-201906051800/"/>
+      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.12/R-4.12-201906051800/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.9.0.v20190603-1146"/>
@@ -55,12 +55,12 @@
       <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.8.0/S201906031146"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.ui.feature.group" version="2.18.0.v20190528-0716"/>
-      <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201905280716"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.ui.feature.group" version="2.18.0.v20190603-1516"/>
+      <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/releases/2.18.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.10.0"/>
@@ -68,7 +68,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-      <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.RC1a-20190604044041/repository/"/>
+      <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.RC2-20190612230649/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.1.201905141505"/>
@@ -135,7 +135,7 @@
       <repository id="oomph" location="https://download.eclipse.org/oomph/drops/release/1.13.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/staging/v5.4.0.201905221418-m3"/>
+      <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/updates-5.4"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <repository id="m2e" location="https://download.eclipse.org/technology/m2e/milestones/1.12/1.12.0.20190529-1916"/>
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 17ebb868318..9dfa0930b55 100644
--- 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/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Toolsmiths" sequenceNumber="1560352553">
+<target name="Papyrus Toolsmiths" sequenceNumber="1561014302">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -47,7 +47,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sdk.feature.group" version="4.12.0.v20190605-1801"/>
-      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.12milestones/S-4.12RC2-201906051800/"/>
+      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.12/R-4.12-201906051800/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.9.0.v20190603-1146"/>
@@ -55,12 +55,12 @@
       <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.8.0/S201906031146"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.18.0.v20190528-0716"/>
-      <unit id="org.eclipse.xtext.ui.feature.group" version="2.18.0.v20190528-0716"/>
-      <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201905280716"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.18.0.v20190603-1516"/>
+      <unit id="org.eclipse.xtext.ui.feature.group" version="2.18.0.v20190603-1516"/>
+      <repository id="xtext" location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.18.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.10.0"/>
@@ -68,7 +68,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-      <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.RC1a-20190604044041/repository/"/>
+      <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.RC2-20190612230649/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.1.201905141505"/>
@@ -135,7 +135,7 @@
       <repository id="oomph" location="https://download.eclipse.org/oomph/drops/release/1.13.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="egit" location="http://download.eclipse.org/egit/staging/v5.4.0.201905221418-m3"/>
+      <repository id="egit" location="http://download.eclipse.org/egit/updates-5.4"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <repository id="m2e" location="https://download.eclipse.org/technology/m2e/milestones/1.12/1.12.0.20190529-1916"/>
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 fadef92bc50..a586a3374fa 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
@@ -54,7 +54,7 @@ location oomph "https://download.eclipse.org/oomph/drops/release/1.13.0" {
 
 //updateFrom("EGIT",0) 
 
-location egit "http://download.eclipse.org/egit/staging/v5.4.0.201905221418-m3" // oomph
+location egit "http://download.eclipse.org/egit/updates-5.4" // oomph
 
 //updateFrom("m2e",0)