[Releng] Regenerate the product catalogs for real 2019-06 release

Also update project setups with new released URLs.

6 files changed, 127 insertions, 360 deletions

diff --git a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductCatalogGenerator.java b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductCatalogGenerator.java
index 4615ae6a3..767435729 100644
--- a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductCatalogGenerator.java
+++ b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductCatalogGenerator.java
@@ -1021,7 +1021,7 @@ public class ProductCatalogGenerator implements IApplication
         IMetadataRepository childRepository = manager.loadRepository(childURI, null);
         String value = childRepository.getProperties().get(IRepository.PROP_TIMESTAMP);
         long timestamp = Long.parseLong(value);
-        if (timestamp > latest)
+        if (timestamp > latest && !childURI.toString().endsWith("categories"))
         {
           result = childRepository;
           latest = timestamp;
diff --git a/setups/com.github.projects.setup b/setups/com.github.projects.setup
index 76c315d27..d618333c0 100644
--- a/setups/com.github.projects.setup
+++ b/setups/com.github.projects.setup
@@ -184,6 +184,15 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/GlobalVariable"/>
       <choice
+          value="2019-09"
+          label="Eclipse 2019-09 - 4.13"/>
+      <choice
+          value="2019-06"
+          label="Eclipse 2019-06 - 4.12"/>
+      <choice
+          value="2019-03"
+          label="Eclipse 2019-03 - 4.11"/>
+      <choice
           value="2018-12"
           label="Eclipse 2018-12 - 4.10"/>
       <choice
diff --git a/setups/org.eclipse.all.product.setup b/setups/org.eclipse.all.product.setup
index 515b0ff87..90a1b31e0 100644
--- a/setups/org.eclipse.all.product.setup
+++ b/setups/org.eclipse.all.product.setup
@@ -26,7 +26,7 @@
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
       <detail
           key="siteURI">
-        <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1</value>
+        <value>https://www.eclipse.org/downloads/packages/release/2019-06/r</value>
       </detail>
     </annotation>
     <setupTask
@@ -67,7 +67,7 @@
           name="org.eclipse.platform.ide"
           versionRange="[4.12.0,5.0.0)"/>
       <repository
-          url="http://download.eclipse.org/releases/2019-06">
+          url="http://download.eclipse.org/releases/2019-06/201906191000">
         <annotation
             source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
       </repository>
@@ -80,7 +80,7 @@
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
       <detail
           key="siteURI">
-        <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1</value>
+        <value>https://www.eclipse.org/downloads/packages/release/2019-06/r</value>
       </detail>
     </annotation>
     <setupTask
@@ -121,7 +121,7 @@
           name="org.eclipse.platform.ide"
           versionRange="[4.12.0,5.0.0)"/>
       <repository
-          url="http://download.eclipse.org/releases/2019-06">
+          url="http://download.eclipse.org/releases/2019-06/201906191000">
         <annotation
             source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
       </repository>
@@ -134,7 +134,7 @@
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
       <detail
           key="siteURI">
-        <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1</value>
+        <value>https://www.eclipse.org/downloads/packages/release/2019-06/r</value>
       </detail>
     </annotation>
     <setupTask
@@ -175,7 +175,7 @@
           name="org.eclipse.platform.ide"
           versionRange="[4.12.0,5.0.0)"/>
       <repository
-          url="http://download.eclipse.org/releases/2019-06">
+          url="http://download.eclipse.org/releases/2019-06/201906191000">
         <annotation
             source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
       </repository>
diff --git a/setups/org.eclipse.platform.sdk.product.setup b/setups/org.eclipse.platform.sdk.product.setup
index 49e1dfd91..98384baaa 100644
--- a/setups/org.eclipse.platform.sdk.product.setup
+++ b/setups/org.eclipse.platform.sdk.product.setup
@@ -35,7 +35,7 @@
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
       <detail
           key="siteURI">
-        <value>https://download.eclipse.org/eclipse/downloads/</value>
+        <value>http://archive.eclipse.org/eclipse/downloads/drops4/R-4.12-201906051800/</value>
       </detail>
     </annotation>
     <setupTask
@@ -55,7 +55,7 @@
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
       <detail
           key="siteURI">
-        <value>https://download.eclipse.org/eclipse/downloads/</value>
+        <value>http://archive.eclipse.org/eclipse/downloads/drops4/R-4.12-201906051800/</value>
       </detail>
     </annotation>
     <setupTask
@@ -75,7 +75,7 @@
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
       <detail
           key="siteURI">
-        <value>https://download.eclipse.org/eclipse/downloads/</value>
+        <value>http://archive.eclipse.org/eclipse/downloads/drops4/R-4.12-201906051800/</value>
       </detail>
     </annotation>
     <setupTask
diff --git a/setups/org.eclipse.products.setup b/setups/org.eclipse.products.setup
index a3ff4443e..16177a35d 100644
--- a/setups/org.eclipse.products.setup
+++ b/setups/org.eclipse.products.setup
@@ -48,7 +48,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-java-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-java-developers</value>
         </detail>
       </annotation>
       <setupTask
@@ -58,12 +58,6 @@
             name="epp.package.java"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.buildship.feature.group"/>
         <requirement
             name="org.eclipse.eclemma.feature.feature.group"/>
@@ -104,7 +98,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -118,7 +112,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-java-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-java-developers</value>
         </detail>
       </annotation>
       <setupTask
@@ -128,12 +122,6 @@
             name="epp.package.java"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.buildship.feature.group"/>
         <requirement
             name="org.eclipse.eclemma.feature.feature.group"/>
@@ -174,7 +162,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -188,7 +176,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-java-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-java-developers</value>
         </detail>
       </annotation>
       <setupTask
@@ -198,12 +186,6 @@
             name="epp.package.java"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.buildship.feature.group"/>
         <requirement
             name="org.eclipse.eclemma.feature.feature.group"/>
@@ -244,7 +226,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -851,7 +833,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-enterprise-java-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-enterprise-java-developers</value>
         </detail>
       </annotation>
       <setupTask
@@ -861,12 +843,6 @@
             name="epp.package.jee"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.buildship.feature.group"/>
         <requirement
             name="org.eclipse.cft.server.core.feature.feature.group"/>
@@ -1039,7 +1015,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -1053,7 +1029,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-enterprise-java-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-enterprise-java-developers</value>
         </detail>
       </annotation>
       <setupTask
@@ -1063,12 +1039,6 @@
             name="epp.package.jee"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.buildship.feature.group"/>
         <requirement
             name="org.eclipse.cft.server.core.feature.feature.group"/>
@@ -1241,7 +1211,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -1255,7 +1225,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-enterprise-java-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-enterprise-java-developers</value>
         </detail>
       </annotation>
       <setupTask
@@ -1265,12 +1235,6 @@
             name="epp.package.jee"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.buildship.feature.group"/>
         <requirement
             name="org.eclipse.cft.server.core.feature.feature.group"/>
@@ -1443,7 +1407,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -2751,7 +2715,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-cc-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-cc-developers</value>
         </detail>
       </annotation>
       <setupTask
@@ -2761,12 +2725,6 @@
             name="epp.package.cpp"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.cdt.arduino.feature.group"/>
         <requirement
             name="org.eclipse.cdt.autotools.feature.group"/>
@@ -2841,7 +2799,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -2855,7 +2813,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-cc-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-cc-developers</value>
         </detail>
       </annotation>
       <setupTask
@@ -2865,12 +2823,6 @@
             name="epp.package.cpp"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.cdt.arduino.feature.group"/>
         <requirement
             name="org.eclipse.cdt.autotools.feature.group"/>
@@ -2945,7 +2897,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -2959,7 +2911,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-cc-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-cc-developers</value>
         </detail>
       </annotation>
       <setupTask
@@ -2969,12 +2921,6 @@
             name="epp.package.cpp"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.cdt.arduino.feature.group"/>
         <requirement
             name="org.eclipse.cdt.autotools.feature.group"/>
@@ -3049,7 +2995,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -3792,7 +3738,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-web-and-javascript-developers-includes-incubating-components</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-web-and-javascript-developers-includes-incubating-components</value>
         </detail>
       </annotation>
       <setupTask
@@ -3802,12 +3748,6 @@
             name="epp.package.javascript"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.egit.feature.group"/>
         <requirement
             name="org.eclipse.egit.gitflow.feature.feature.group"/>
@@ -3846,7 +3786,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -3860,7 +3800,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-web-and-javascript-developers-includes-incubating-components</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-web-and-javascript-developers-includes-incubating-components</value>
         </detail>
       </annotation>
       <setupTask
@@ -3870,12 +3810,6 @@
             name="epp.package.javascript"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.egit.feature.group"/>
         <requirement
             name="org.eclipse.egit.gitflow.feature.feature.group"/>
@@ -3914,7 +3848,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -3928,7 +3862,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-web-and-javascript-developers-includes-incubating-components</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-web-and-javascript-developers-includes-incubating-components</value>
         </detail>
       </annotation>
       <setupTask
@@ -3938,12 +3872,6 @@
             name="epp.package.javascript"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.egit.feature.group"/>
         <requirement
             name="org.eclipse.egit.gitflow.feature.feature.group"/>
@@ -3982,7 +3910,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -4455,7 +4383,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-php-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-php-developers</value>
         </detail>
       </annotation>
       <setupTask
@@ -4465,12 +4393,6 @@
             name="epp.package.php"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.egit.feature.group"/>
         <requirement
             name="org.eclipse.egit.gitflow.feature.feature.group"/>
@@ -4509,7 +4431,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -4523,7 +4445,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-php-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-php-developers</value>
         </detail>
       </annotation>
       <setupTask
@@ -4533,12 +4455,6 @@
             name="epp.package.php"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.egit.feature.group"/>
         <requirement
             name="org.eclipse.egit.gitflow.feature.feature.group"/>
@@ -4577,7 +4493,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -4591,7 +4507,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-php-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-php-developers</value>
         </detail>
       </annotation>
       <setupTask
@@ -4601,12 +4517,6 @@
             name="epp.package.php"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.egit.feature.group"/>
         <requirement
             name="org.eclipse.egit.gitflow.feature.feature.group"/>
@@ -4645,7 +4555,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -5133,7 +5043,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-eclipse-committers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-eclipse-committers</value>
         </detail>
       </annotation>
       <setupTask
@@ -5143,12 +5053,6 @@
             name="epp.package.committers"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.buildship.feature.group"/>
         <requirement
             name="org.eclipse.cvs.feature.group"/>
@@ -5223,7 +5127,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -5237,7 +5141,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-eclipse-committers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-eclipse-committers</value>
         </detail>
       </annotation>
       <setupTask
@@ -5247,12 +5151,6 @@
             name="epp.package.committers"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.buildship.feature.group"/>
         <requirement
             name="org.eclipse.cvs.feature.group"/>
@@ -5327,7 +5225,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -5341,7 +5239,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-eclipse-committers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-eclipse-committers</value>
         </detail>
       </annotation>
       <setupTask
@@ -5351,12 +5249,6 @@
             name="epp.package.committers"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.buildship.feature.group"/>
         <requirement
             name="org.eclipse.cvs.feature.group"/>
@@ -5431,7 +5323,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -6149,7 +6041,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-java-and-dsl-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-java-and-dsl-developers</value>
         </detail>
       </annotation>
       <setupTask
@@ -6185,7 +6077,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -6199,7 +6091,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-java-and-dsl-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-java-and-dsl-developers</value>
         </detail>
       </annotation>
       <setupTask
@@ -6235,7 +6127,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -6249,7 +6141,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-java-and-dsl-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-java-and-dsl-developers</value>
         </detail>
       </annotation>
       <setupTask
@@ -6285,7 +6177,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -6758,7 +6650,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-java-and-report-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r</value>
         </detail>
       </annotation>
       <setupTask
@@ -6768,12 +6660,6 @@
             name="epp.package.reporting"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.birt.chart.cshelp.feature.group"/>
         <requirement
             name="org.eclipse.birt.cshelp.feature.group"/>
@@ -6920,7 +6806,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -6934,7 +6820,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-java-and-report-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r</value>
         </detail>
       </annotation>
       <setupTask
@@ -6944,12 +6830,6 @@
             name="epp.package.reporting"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.birt.chart.cshelp.feature.group"/>
         <requirement
             name="org.eclipse.birt.cshelp.feature.group"/>
@@ -7096,7 +6976,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -7110,7 +6990,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-java-and-report-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r</value>
         </detail>
       </annotation>
       <setupTask
@@ -7120,12 +7000,6 @@
             name="epp.package.reporting"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.birt.chart.cshelp.feature.group"/>
         <requirement
             name="org.eclipse.birt.cshelp.feature.group"/>
@@ -7272,7 +7146,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -8411,7 +8285,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-modeling-tools</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-modeling-tools</value>
         </detail>
       </annotation>
       <setupTask
@@ -8421,12 +8295,6 @@
             name="epp.package.modeling"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.e4.core.tools.feature.feature.group"/>
         <requirement
             name="org.eclipse.egit.feature.group"/>
@@ -8495,7 +8363,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -8509,7 +8377,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-modeling-tools</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-modeling-tools</value>
         </detail>
       </annotation>
       <setupTask
@@ -8519,12 +8387,6 @@
             name="epp.package.modeling"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.e4.core.tools.feature.feature.group"/>
         <requirement
             name="org.eclipse.egit.feature.group"/>
@@ -8593,7 +8455,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -8607,7 +8469,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-modeling-tools</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-modeling-tools</value>
         </detail>
       </annotation>
       <setupTask
@@ -8617,12 +8479,6 @@
             name="epp.package.modeling"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.e4.core.tools.feature.feature.group"/>
         <requirement
             name="org.eclipse.egit.feature.group"/>
@@ -8691,7 +8547,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -9704,7 +9560,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-rcp-and-rap-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-rcp-and-rap-developers</value>
         </detail>
       </annotation>
       <setupTask
@@ -9714,18 +9570,6 @@
             name="epp.package.rcp"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.jdt.feature.group"
-            versionRange="[3.18.0,4.0.0)"/>
-        <requirement
-            name="org.eclipse.pde.feature.group"
-            versionRange="[3.14.0,4.0.0)"/>
-        <requirement
             name="org.eclipse.buildship.feature.group"/>
         <requirement
             name="org.eclipse.e4.core.tools.feature.feature.group"/>
@@ -9772,7 +9616,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -9786,7 +9630,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-rcp-and-rap-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-rcp-and-rap-developers</value>
         </detail>
       </annotation>
       <setupTask
@@ -9796,18 +9640,6 @@
             name="epp.package.rcp"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.jdt.feature.group"
-            versionRange="[3.18.0,4.0.0)"/>
-        <requirement
-            name="org.eclipse.pde.feature.group"
-            versionRange="[3.14.0,4.0.0)"/>
-        <requirement
             name="org.eclipse.buildship.feature.group"/>
         <requirement
             name="org.eclipse.e4.core.tools.feature.feature.group"/>
@@ -9854,7 +9686,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -9868,7 +9700,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-rcp-and-rap-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-rcp-and-rap-developers</value>
         </detail>
       </annotation>
       <setupTask
@@ -9878,18 +9710,6 @@
             name="epp.package.rcp"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.jdt.feature.group"
-            versionRange="[3.18.0,4.0.0)"/>
-        <requirement
-            name="org.eclipse.pde.feature.group"
-            versionRange="[3.14.0,4.0.0)"/>
-        <requirement
             name="org.eclipse.buildship.feature.group"/>
         <requirement
             name="org.eclipse.e4.core.tools.feature.feature.group"/>
@@ -9936,7 +9756,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -10625,7 +10445,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-testers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-testers</value>
         </detail>
       </annotation>
       <setupTask
@@ -10635,12 +10455,6 @@
             name="epp.package.testing"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.epp.mpc.feature.group"/>
         <requirement
             name="org.eclipse.jubula.feature.feature.group"/>
@@ -10657,7 +10471,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -10671,7 +10485,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-testers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-testers</value>
         </detail>
       </annotation>
       <setupTask
@@ -10681,12 +10495,6 @@
             name="epp.package.testing"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.epp.mpc.feature.group"/>
         <requirement
             name="org.eclipse.jubula.feature.feature.group"/>
@@ -10703,7 +10511,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -10717,7 +10525,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-testers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-testers</value>
         </detail>
       </annotation>
       <setupTask
@@ -10727,12 +10535,6 @@
             name="epp.package.testing"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.epp.mpc.feature.group"/>
         <requirement
             name="org.eclipse.jubula.feature.feature.group"/>
@@ -10749,7 +10551,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -11176,7 +10978,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-scientific-computing</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-scientific-computing</value>
         </detail>
       </annotation>
       <setupTask
@@ -11186,12 +10988,6 @@
             name="epp.package.parallel"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.cdt.autotools.feature.group"/>
         <requirement
             name="org.eclipse.cdt.build.crossgcc.feature.group"/>
@@ -11254,7 +11050,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -11268,7 +11064,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-scientific-computing</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-scientific-computing</value>
         </detail>
       </annotation>
       <setupTask
@@ -11278,12 +11074,6 @@
             name="epp.package.parallel"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.cdt.autotools.feature.group"/>
         <requirement
             name="org.eclipse.cdt.build.crossgcc.feature.group"/>
@@ -11346,7 +11136,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -11360,7 +11150,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-scientific-computing</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-scientific-computing</value>
         </detail>
       </annotation>
       <setupTask
@@ -11370,12 +11160,6 @@
             name="epp.package.parallel"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.cdt.autotools.feature.group"/>
         <requirement
             name="org.eclipse.cdt.build.crossgcc.feature.group"/>
@@ -11438,7 +11222,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -12354,7 +12138,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-scout-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-scout-developers</value>
         </detail>
       </annotation>
       <setupTask
@@ -12364,12 +12148,6 @@
             name="epp.package.scout"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.egit.feature.group"/>
         <requirement
             name="org.eclipse.egit.mylyn.feature.group"/>
@@ -12408,7 +12186,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -12422,7 +12200,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-scout-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-scout-developers</value>
         </detail>
       </annotation>
       <setupTask
@@ -12432,12 +12210,6 @@
             name="epp.package.scout"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.egit.feature.group"/>
         <requirement
             name="org.eclipse.egit.mylyn.feature.group"/>
@@ -12476,7 +12248,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -12490,7 +12262,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-scout-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-scout-developers</value>
         </detail>
       </annotation>
       <setupTask
@@ -12500,12 +12272,6 @@
             name="epp.package.scout"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.egit.feature.group"/>
         <requirement
             name="org.eclipse.egit.mylyn.feature.group"/>
@@ -12544,7 +12310,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -13120,7 +12886,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-rust-developers-includes-incubating-components</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-rust-developers-includes-incubating-components</value>
         </detail>
       </annotation>
       <setupTask
@@ -13130,12 +12896,6 @@
             name="epp.package.rust"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.corrosion.feature.feature.group"/>
         <requirement
             name="org.eclipse.egit.feature.group"/>
@@ -13160,7 +12920,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -13174,7 +12934,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-rust-developers-includes-incubating-components</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-rust-developers-includes-incubating-components</value>
         </detail>
       </annotation>
       <setupTask
@@ -13184,12 +12944,6 @@
             name="epp.package.rust"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.corrosion.feature.feature.group"/>
         <requirement
             name="org.eclipse.egit.feature.group"/>
@@ -13214,7 +12968,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -13228,7 +12982,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2019-06/rc1/eclipse-ide-rust-developers-includes-incubating-components</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2019-06/r/eclipse-ide-rust-developers-includes-incubating-components</value>
         </detail>
       </annotation>
       <setupTask
@@ -13238,12 +12992,6 @@
             name="epp.package.rust"
             versionRange="[4.12.0,5.0.0)"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.12.0,5.0.0)"/>
-        <requirement
             name="org.eclipse.corrosion.feature.feature.group"/>
         <requirement
             name="org.eclipse.egit.feature.group"/>
@@ -13268,7 +13016,7 @@
         <repository
             url="http://download.eclipse.org/technology/epp/packages/2019-06"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -13512,7 +13260,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://download.eclipse.org/eclipse/downloads/</value>
+          <value>http://archive.eclipse.org/eclipse/downloads/drops4/R-4.12-201906051800/</value>
         </detail>
       </annotation>
       <setupTask
@@ -13528,7 +13276,7 @@
             name="org.eclipse.rcp.feature.group"
             versionRange="[4.12.0,5.0.0)"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -13542,7 +13290,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://download.eclipse.org/eclipse/downloads/</value>
+          <value>http://archive.eclipse.org/eclipse/downloads/drops4/R-4.12-201906051800/</value>
         </detail>
       </annotation>
       <setupTask
@@ -13558,7 +13306,7 @@
             name="org.eclipse.rcp.feature.group"
             versionRange="[4.12.0,5.0.0)"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -13572,7 +13320,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://download.eclipse.org/eclipse/downloads/</value>
+          <value>http://archive.eclipse.org/eclipse/downloads/drops4/R-4.12-201906051800/</value>
         </detail>
       </annotation>
       <setupTask
@@ -13588,7 +13336,7 @@
             name="org.eclipse.rcp.feature.group"
             versionRange="[4.12.0,5.0.0)"/>
         <repository
-            url="http://download.eclipse.org/releases/2019-06">
+            url="http://download.eclipse.org/releases/2019-06/201906191000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
diff --git a/setups/org.eclipse.projects.setup b/setups/org.eclipse.projects.setup
index 401174bcd..2de52173c 100644
--- a/setups/org.eclipse.projects.setup
+++ b/setups/org.eclipse.projects.setup
@@ -330,15 +330,15 @@
     <setupTask
         xsi:type="setup:VariableTask"
         name="eclipse.latest.p2"
-        value="http://download.eclipse.org/eclipse/updates/4.12-I-builds"
-        label="Eclipse Latest I-Build p2 Repository - 4.12">
+        value="http://download.eclipse.org/eclipse/updates/4.13-I-builds"
+        label="Eclipse Latest I-Build p2 Repository - 4.13">
       <description>The update site of the latest Eclipse project's builds, typically an I-Build for the next release</description>
     </setupTask>
     <setupTask
         xsi:type="setup:VariableTask"
         name="eclipse.latest.release.p2"
-        value="http://download.eclipse.org/eclipse/updates/4.11/R-4.11-201903070500"
-        label="Eclipse Latest Release p2 Repository - 4.11">
+        value="http://download.eclipse.org/eclipse/updates/4.12/R-4.12-201906051800"
+        label="Eclipse Latest Release p2 Repository - 4.12">
       <description>The update site of the latest released Eclipse project's builds, always an R-Build for the most recent release</description>
     </setupTask>
     <setupTask
@@ -409,7 +409,7 @@
     <setupTask
         xsi:type="setup:VariableTask"
         name="eclipse.target.platform.latest.released"
-        value="2019-03"
+        value="2019-06"
         storageURI="scope://Workspace"
         label="Target Platform Latest Released">
       <annotation
@@ -471,7 +471,7 @@
     <setupTask
         xsi:type="setup:VariableTask"
         name="eclipse.api.baseline.target.platform.latest.released"
-        value="2019-03"
+        value="2019-06"
         storageURI="scope://Workspace"
         label="Target Platform Latest Released">
       <annotation
@@ -535,9 +535,14 @@
       <repositoryList
           name="None"/>
       <repositoryList
+          name="2019-09">
+        <repository
+            url="http://download.eclipse.org/eclipse/updates/4.13-I-builds"/>
+      </repositoryList>
+      <repositoryList
           name="2019-06">
         <repository
-            url="http://download.eclipse.org/eclipse/updates/4.12-I-builds"/>
+            url="http://download.eclipse.org/eclipse/updates/4.12/R-4.12-201906051800"/>
       </repositoryList>
       <repositoryList
           name="2019-03">
@@ -618,9 +623,14 @@
       <repositoryList
           name="None"/>
       <repositoryList
+          name="2019-09">
+        <repository
+            url="http://download.eclipse.org/eclipse/updates/4.13-I-builds"/>
+      </repositoryList>
+      <repositoryList
           name="2019-06">
         <repository
-            url="http://download.eclipse.org/eclipse/updates/4.12-I-builds"/>
+            url="http://download.eclipse.org/eclipse/updates/4.12/R-4.12-201906051800"/>
       </repositoryList>
       <repositoryList
           name="2019-03">