From 30bdd9406ca26f72f55714abf3c53eb45828c006 Mon Sep 17 00:00:00 2001
From: Ed Merks <ed.merks@gmail.com>
Date: Tue, 15 Jun 2021 19:45:33 +0200
Subject: [PATCH] [Releng] Regenerate catalogs for 2021-06 release.

---
 setups/org.eclipse.all.product.setup          |  26 +-
 setups/org.eclipse.jres.setup                 |  21 +
 setups/org.eclipse.platform.sdk.product.setup |  22 +-
 setups/org.eclipse.products.setup             | 404 ++++++++++--------
 setups/org.eclipse.projects.setup             |   5 +-
 setups/org.eclipse.setup                      |   2 +-
 6 files changed, 282 insertions(+), 198 deletions(-)

diff --git a/setups/org.eclipse.all.product.setup b/setups/org.eclipse.all.product.setup
index 946bccd5d..004dde3ab 100644
--- a/setups/org.eclipse.all.product.setup
+++ b/setups/org.eclipse.all.product.setup
@@ -11,7 +11,7 @@
       source="http://www.eclipse.org/oomph/setup/BrandingInfo">
     <detail
         key="notificationURI">
-      <value>https://www.eclipse.org/setups/donate/?scope=${scope}&amp;campaign=2021-03</value>
+      <value>https://www.eclipse.org/setups/donate/?scope=${scope}&amp;campaign=2021-06</value>
     </detail>
     <detail
         key="notificationLabel">
@@ -45,7 +45,7 @@
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
       <detail
           key="siteURI">
-        <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1</value>
+        <value>https://www.eclipse.org/downloads/packages/release/2021-06/r</value>
       </detail>
       <detail
           key="shortcut">
@@ -86,20 +86,20 @@
           name="org.eclipse.platform.ide"
           versionRange="[4.20.0,5.0.0)"/>
       <repository
-          url="http://download.eclipse.org/releases/2021-06/202106041001">
+          url="http://download.eclipse.org/releases/2021-06/202106161001">
         <annotation
             source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
       </repository>
     </setupTask>
   </version>
   <version name="latest.released"
-      label="Latest Release (2021-03)"
+      label="Latest Release (2021-06)"
       requiredJavaVersion="11">
     <annotation
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
       <detail
           key="siteURI">
-        <value>https://www.eclipse.org/downloads/packages/release/2021-03/r</value>
+        <value>https://www.eclipse.org/downloads/packages/release/2021-06/r</value>
       </detail>
       <detail
           key="shortcut">
@@ -108,7 +108,7 @@
     </annotation>
     <setupTask
         xsi:type="setup.p2:P2Task"
-        label="Eclipse Eierlegende Wollmilchsau (2021-03)">
+        label="Eclipse Eierlegende Wollmilchsau (2021-06)">
       <requirement
           name="Application Development Frameworks"/>
       <requirement
@@ -138,9 +138,9 @@
           name="Web, XML, Java EE and OSGi Enterprise Development"/>
       <requirement
           name="org.eclipse.platform.ide"
-          versionRange="[4.19.0,5.0.0)"/>
+          versionRange="[4.20.0,5.0.0)"/>
       <repository
-          url="http://download.eclipse.org/releases/2021-03/202103171000">
+          url="http://download.eclipse.org/releases/2021-06/202106161001">
         <annotation
             source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
       </repository>
@@ -151,9 +151,13 @@
       requiredJavaVersion="11">
     <annotation
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+      <detail
+          key="status">
+        <value>current</value>
+      </detail>
       <detail
           key="siteURI">
-        <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1</value>
+        <value>https://www.eclipse.org/downloads/packages/release/2021-06/r</value>
       </detail>
       <detail
           key="shortcut">
@@ -194,7 +198,7 @@
           name="org.eclipse.platform.ide"
           versionRange="[4.20.0,5.0.0)"/>
       <repository
-          url="http://download.eclipse.org/releases/2021-06/202106041001">
+          url="http://download.eclipse.org/releases/2021-06/202106161001">
         <annotation
             source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
       </repository>
@@ -207,7 +211,7 @@
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
       <detail
           key="status">
-        <value>current</value>
+        <value>outdated</value>
       </detail>
       <detail
           key="siteURI">
diff --git a/setups/org.eclipse.jres.setup b/setups/org.eclipse.jres.setup
index 525b2540b..eebc0a5e0 100644
--- a/setups/org.eclipse.jres.setup
+++ b/setups/org.eclipse.jres.setup
@@ -46,5 +46,26 @@
       Provides the complete set of modules of the JDK, excluding incubators.
     </description>
   </setupTask>
+  <setupTask
+      xsi:type="setup.p2:P2Task"
+      label="JRE 16.0.1">
+    <annotation
+        source="http://www.eclipse.org/oomph/setup/JRESpecificTasks">
+      <content
+          xsi:type="setup:EclipseIniTask"
+          option="--illegal-access"
+          value="=permit"
+          vm="true"/>
+    </annotation>
+    <requirement
+        name="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group"
+        filter="(|(&amp;(osgi.arch=aarch64)(osgi.os=linux))(&amp;(osgi.arch=x86_64)(osgi.os=linux))(&amp;(osgi.arch=x86_64)(osgi.os=macosx))(&amp;(osgi.arch=x86_64)(osgi.os=win32)))"/>
+    <repository
+        url="http://download.eclipse.org/justj/jres/16/updates/release/16.0.1"/>
+    <description>
+      Contains the plug-ins and fragments for the OpenJDK Hotspot JRE Complete.
+      Provides the complete set of modules of the JDK, excluding incubators.
+    </description>
+  </setupTask>
   <description>The JRE macro provides tasks for installing JREs from JustJ's p2 update sites</description>
 </setup:Macro>
diff --git a/setups/org.eclipse.platform.sdk.product.setup b/setups/org.eclipse.platform.sdk.product.setup
index 12b616f39..064b7aa46 100644
--- a/setups/org.eclipse.platform.sdk.product.setup
+++ b/setups/org.eclipse.platform.sdk.product.setup
@@ -11,7 +11,7 @@
       source="http://www.eclipse.org/oomph/setup/BrandingInfo">
     <detail
         key="notificationURI">
-      <value>https://www.eclipse.org/setups/donate/?scope=${scope}&amp;campaign=2021-03</value>
+      <value>https://www.eclipse.org/setups/donate/?scope=${scope}&amp;campaign=2021-06</value>
     </detail>
     <detail
         key="notificationLabel">
@@ -68,17 +68,17 @@
           name="org.eclipse.sdk.ide"
           versionRange="[4.20.0,5.0.0)"/>
       <repository
-          url="http://download.eclipse.org/eclipse/updates/4.20-I-builds"/>
+          url="http://download.eclipse.org/eclipse/updates/4.20/R-4.20-202106111600"/>
     </setupTask>
   </version>
   <version name="latest.released"
-      label="Latest Release (4.19 - 2021-03)"
+      label="Latest Release (4.20 - 2021-06)"
       requiredJavaVersion="11">
     <annotation
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
       <detail
           key="siteURI">
-        <value>http://archive.eclipse.org/eclipse/downloads/drops4/R-4.19-202103031800/</value>
+        <value>https://download.eclipse.org/eclipse/downloads/</value>
       </detail>
       <detail
           key="shortcut">
@@ -87,12 +87,12 @@
     </annotation>
     <setupTask
         xsi:type="setup.p2:P2Task"
-        label="Eclipse SDK (4.19 - 2021-03)">
+        label="Eclipse SDK (4.20 - 2021-06)">
       <requirement
           name="org.eclipse.sdk.ide"
-          versionRange="[4.19.0,5.0.0)"/>
+          versionRange="[4.20.0,5.0.0)"/>
       <repository
-          url="http://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800"/>
+          url="http://download.eclipse.org/eclipse/updates/4.20/R-4.20-202106111600"/>
     </setupTask>
   </version>
   <version name="4.20"
@@ -100,6 +100,10 @@
       requiredJavaVersion="11">
     <annotation
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+      <detail
+          key="status">
+        <value>current</value>
+      </detail>
       <detail
           key="siteURI">
         <value>https://download.eclipse.org/eclipse/downloads/</value>
@@ -116,7 +120,7 @@
           name="org.eclipse.sdk.ide"
           versionRange="[4.20.0,5.0.0)"/>
       <repository
-          url="http://download.eclipse.org/eclipse/updates/4.20-I-builds"/>
+          url="http://download.eclipse.org/eclipse/updates/4.20/R-4.20-202106111600"/>
     </setupTask>
   </version>
   <version name="4.19"
@@ -126,7 +130,7 @@
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
       <detail
           key="status">
-        <value>current</value>
+        <value>outdated</value>
       </detail>
       <detail
           key="siteURI">
diff --git a/setups/org.eclipse.products.setup b/setups/org.eclipse.products.setup
index b59c9f43f..2ed84c9b7 100644
--- a/setups/org.eclipse.products.setup
+++ b/setups/org.eclipse.products.setup
@@ -15,7 +15,7 @@
     </detail>
     <detail
         key="notificationURI">
-      <value>https://www.eclipse.org/setups/donate/?scope=${scope}&amp;campaign=2021-03</value>
+      <value>https://www.eclipse.org/setups/donate/?scope=${scope}&amp;campaign=2021-06</value>
     </detail>
     <detail
         key="notificationLabel">
@@ -68,7 +68,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1/eclipse-ide-java-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-java-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -114,9 +114,9 @@
         <requirement
             name="org.eclipse.wildwebdeveloper.xml.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106031200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -124,13 +124,13 @@
     </version>
     <version
         name="latest.released"
-        label="Latest Release (2021-03)"
+        label="Latest Release (2021-06)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-03/r/eclipse-ide-java-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-java-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -139,16 +139,16 @@
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse IDE for Java Developers (2021-03)">
+          label="Eclipse IDE for Java Developers (2021-06)">
         <requirement
             name="epp.package.java"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.buildship.feature.group"/>
         <requirement
@@ -176,9 +176,9 @@
         <requirement
             name="org.eclipse.wildwebdeveloper.xml.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202103121200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202103171000">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -190,9 +190,13 @@
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="status">
+          <value>current</value>
+        </detail>
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1/eclipse-ide-java-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-java-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -238,9 +242,9 @@
         <requirement
             name="org.eclipse.wildwebdeveloper.xml.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106031200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -254,7 +258,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="status">
-          <value>current</value>
+          <value>outdated</value>
         </detail>
         <detail
             key="siteURI">
@@ -1503,7 +1507,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1/eclipse-ide-enterprise-java-and-web-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-enterprise-java-and-web-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -1689,9 +1693,9 @@
         <requirement
             name="org.eclipse.wst.xsl.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106031200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -1699,13 +1703,13 @@
     </version>
     <version
         name="latest.released"
-        label="Latest Release (2021-03)"
+        label="Latest Release (2021-06)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-03/r/eclipse-ide-enterprise-java-and-web-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-enterprise-java-and-web-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -1714,16 +1718,16 @@
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse IDE for Enterprise Java and Web Developers (2021-03)">
+          label="Eclipse IDE for Enterprise Java and Web Developers (2021-06)">
         <requirement
             name="epp.package.jee"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.buildship.feature.group"/>
         <requirement
@@ -1848,6 +1852,8 @@
             name="org.eclipse.jst.ws.jaxws.feature.feature.group"/>
         <requirement
             name="org.eclipse.m2e.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.m2e.lemminx.feature.feature.group"/>
         <requirement
             name="org.eclipse.m2e.logback.feature.feature.group"/>
         <requirement
@@ -1889,9 +1895,9 @@
         <requirement
             name="org.eclipse.wst.xsl.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202103121200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202103171000">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -1903,9 +1909,13 @@
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="status">
+          <value>current</value>
+        </detail>
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1/eclipse-ide-enterprise-java-and-web-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-enterprise-java-and-web-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -2091,9 +2101,9 @@
         <requirement
             name="org.eclipse.wst.xsl.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106031200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -2107,7 +2117,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="status">
-          <value>current</value>
+          <value>outdated</value>
         </detail>
         <detail
             key="siteURI">
@@ -5138,7 +5148,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1/eclipse-ide-cc-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-cc-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -5218,9 +5228,9 @@
         <requirement
             name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106031200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -5228,13 +5238,13 @@
     </version>
     <version
         name="latest.released"
-        label="Latest Release (2021-03)"
+        label="Latest Release (2021-06)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-03/r/eclipse-ide-cc-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-cc-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -5243,16 +5253,16 @@
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse IDE for C/C++ Developers (2021-03)">
+          label="Eclipse IDE for C/C++ Developers (2021-06)">
         <requirement
             name="epp.package.cpp"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.cdt.autotools.feature.group"/>
         <requirement
@@ -5314,9 +5324,9 @@
         <requirement
             name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202103121200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202103171000">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -5328,9 +5338,13 @@
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="status">
+          <value>current</value>
+        </detail>
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1/eclipse-ide-cc-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-cc-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -5410,9 +5424,9 @@
         <requirement
             name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106031200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -5426,7 +5440,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="status">
-          <value>current</value>
+          <value>outdated</value>
         </detail>
         <detail
             key="siteURI">
@@ -7109,7 +7123,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1/eclipse-ide-embedded-cc-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-embedded-cc-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -7219,9 +7233,9 @@
         <requirement
             name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106031200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -7229,13 +7243,13 @@
     </version>
     <version
         name="latest.released"
-        label="Latest Release (2021-03)"
+        label="Latest Release (2021-06)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-03/r/eclipse-ide-embedded-cc-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-embedded-cc-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -7244,16 +7258,16 @@
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse IDE for Embedded C/C++ Developers (2021-03)">
+          label="Eclipse IDE for Embedded C/C++ Developers (2021-06)">
         <requirement
             name="epp.package.embedcpp"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.cdt.autotools.feature.group"/>
         <requirement
@@ -7345,9 +7359,9 @@
         <requirement
             name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202103121200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202103171000">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -7359,9 +7373,13 @@
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="status">
+          <value>current</value>
+        </detail>
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1/eclipse-ide-embedded-cc-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-embedded-cc-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -7471,9 +7489,9 @@
         <requirement
             name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106031200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -7487,7 +7505,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="status">
-          <value>current</value>
+          <value>outdated</value>
         </detail>
         <detail
             key="siteURI">
@@ -8880,7 +8898,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1/eclipse-ide-php-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-php-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -8938,9 +8956,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106031200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -8948,13 +8966,13 @@
     </version>
     <version
         name="latest.released"
-        label="Latest Release (2021-03)"
+        label="Latest Release (2021-06)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-03/r/eclipse-ide-php-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-php-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -8963,16 +8981,16 @@
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse IDE for PHP Developers (2021-03)">
+          label="Eclipse IDE for PHP Developers (2021-06)">
         <requirement
             name="epp.package.php"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.egit.feature.group"/>
         <requirement
@@ -9012,9 +9030,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202103121200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202103171000">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -9026,9 +9044,13 @@
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="status">
+          <value>current</value>
+        </detail>
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1/eclipse-ide-php-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-php-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -9086,9 +9108,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106031200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -9102,7 +9124,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="status">
-          <value>current</value>
+          <value>outdated</value>
         </detail>
         <detail
             key="siteURI">
@@ -10267,7 +10289,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1/eclipse-ide-eclipse-committers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-eclipse-committers</value>
         </detail>
         <detail
             key="shortcut">
@@ -10365,9 +10387,9 @@
         <requirement
             name="org.eclipse.wildwebdeveloper.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106031200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -10375,13 +10397,13 @@
     </version>
     <version
         name="latest.released"
-        label="Latest Release (2021-03)"
+        label="Latest Release (2021-06)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-03/r/eclipse-ide-eclipse-committers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-eclipse-committers</value>
         </detail>
         <detail
             key="shortcut">
@@ -10390,16 +10412,16 @@
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse IDE for Eclipse Committers (2021-03)">
+          label="Eclipse IDE for Eclipse Committers (2021-06)">
         <requirement
             name="epp.package.committers"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.buildship.feature.group"/>
         <requirement
@@ -10472,14 +10494,16 @@
             name="org.eclipse.rcp.source.feature.group"/>
         <requirement
             name="org.eclipse.swt.tools.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.test.feature.group"/>
         <requirement
             name="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group"/>
         <requirement
             name="org.eclipse.wildwebdeveloper.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202103121200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202103171000">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -10491,9 +10515,13 @@
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="status">
+          <value>current</value>
+        </detail>
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1/eclipse-ide-eclipse-committers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-eclipse-committers</value>
         </detail>
         <detail
             key="shortcut">
@@ -10591,9 +10619,9 @@
         <requirement
             name="org.eclipse.wildwebdeveloper.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106031200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -10607,7 +10635,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="status">
-          <value>current</value>
+          <value>outdated</value>
         </detail>
         <detail
             key="siteURI">
@@ -12259,7 +12287,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1/eclipse-ide-java-and-dsl-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-java-and-dsl-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -12297,9 +12325,9 @@
         <requirement
             name="org.eclipse.xtext.sdk.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106031200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -12307,13 +12335,13 @@
     </version>
     <version
         name="latest.released"
-        label="Latest Release (2021-03)"
+        label="Latest Release (2021-06)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-03/r/eclipse-ide-java-and-dsl-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-java-and-dsl-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -12322,16 +12350,16 @@
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse DSL Tools (2021-03)">
+          label="Eclipse DSL Tools (2021-06)">
         <requirement
             name="epp.package.dsl"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.jdt.feature.group"
             versionRange="[3.18.0,4.0.0)"/>
@@ -12351,9 +12379,9 @@
         <requirement
             name="org.eclipse.xtext.sdk.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202103121200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202103171000">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -12365,9 +12393,13 @@
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="status">
+          <value>current</value>
+        </detail>
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1/eclipse-ide-java-and-dsl-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-java-and-dsl-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -12405,9 +12437,9 @@
         <requirement
             name="org.eclipse.xtext.sdk.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106031200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -12421,7 +12453,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="status">
-          <value>current</value>
+          <value>outdated</value>
         </detail>
         <detail
             key="siteURI">
@@ -13428,7 +13460,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1/eclipse-modeling-tools</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-modeling-tools</value>
         </detail>
         <detail
             key="shortcut">
@@ -13500,9 +13532,9 @@
         <requirement
             name="org.eclipse.xsd.sdk.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106031200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -13510,13 +13542,13 @@
     </version>
     <version
         name="latest.released"
-        label="Latest Release (2021-03)"
+        label="Latest Release (2021-06)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-03/r/eclipse-modeling-tools</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-modeling-tools</value>
         </detail>
         <detail
             key="shortcut">
@@ -13525,16 +13557,16 @@
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse Modeling Tools (2021-03)">
+          label="Eclipse Modeling Tools (2021-06)">
         <requirement
             name="epp.package.modeling"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.e4.core.tools.feature.feature.group"/>
         <requirement
@@ -13588,9 +13620,9 @@
         <requirement
             name="org.eclipse.xsd.sdk.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202103121200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202103171000">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -13602,9 +13634,13 @@
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="status">
+          <value>current</value>
+        </detail>
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1/eclipse-modeling-tools</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-modeling-tools</value>
         </detail>
         <detail
             key="shortcut">
@@ -13676,9 +13712,9 @@
         <requirement
             name="org.eclipse.xsd.sdk.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106031200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -13692,7 +13728,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="status">
-          <value>current</value>
+          <value>outdated</value>
         </detail>
         <detail
             key="siteURI">
@@ -15323,7 +15359,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1/eclipse-ide-rcp-and-rap-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-rcp-and-rap-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -15381,9 +15417,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106031200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -15391,13 +15427,13 @@
     </version>
     <version
         name="latest.released"
-        label="Latest Release (2021-03)"
+        label="Latest Release (2021-06)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-03/r/eclipse-ide-rcp-and-rap-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-rcp-and-rap-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -15406,16 +15442,16 @@
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse for RCP and RAP Developers (2021-03)">
+          label="Eclipse for RCP and RAP Developers (2021-06)">
         <requirement
             name="epp.package.rcp"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.jdt.feature.group"
             versionRange="[3.18.0,4.0.0)"/>
@@ -15455,9 +15491,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202103121200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202103171000">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -15469,9 +15505,13 @@
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="status">
+          <value>current</value>
+        </detail>
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1/eclipse-ide-rcp-and-rap-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-rcp-and-rap-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -15529,9 +15569,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106031200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -15545,7 +15585,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="status">
-          <value>current</value>
+          <value>outdated</value>
         </detail>
         <detail
             key="siteURI">
@@ -17837,7 +17877,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1/eclipse-ide-scientific-computing</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-scientific-computing</value>
         </detail>
         <detail
             key="shortcut">
@@ -17899,9 +17939,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106031200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -17909,13 +17949,13 @@
     </version>
     <version
         name="latest.released"
-        label="Latest Release (2021-03)"
+        label="Latest Release (2021-06)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-03/r/eclipse-ide-scientific-computing</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-scientific-computing</value>
         </detail>
         <detail
             key="shortcut">
@@ -17924,16 +17964,16 @@
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse for Scientific Computing (2021-03)">
+          label="Eclipse for Scientific Computing (2021-06)">
         <requirement
             name="epp.package.parallel"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.cdt.autotools.feature.group"/>
         <requirement
@@ -17977,9 +18017,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202103121200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202103171000">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -17991,9 +18031,13 @@
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="status">
+          <value>current</value>
+        </detail>
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1/eclipse-ide-scientific-computing</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-scientific-computing</value>
         </detail>
         <detail
             key="shortcut">
@@ -18055,9 +18099,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106031200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -18071,7 +18115,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="status">
-          <value>current</value>
+          <value>outdated</value>
         </detail>
         <detail
             key="siteURI">
@@ -19544,7 +19588,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1/eclipse-ide-scout-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-scout-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -19590,9 +19634,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106031200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -19600,13 +19644,13 @@
     </version>
     <version
         name="latest.released"
-        label="Latest Release (2021-03)"
+        label="Latest Release (2021-06)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-03/r/eclipse-ide-scout-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-scout-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -19615,16 +19659,16 @@
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse for Scout Developers (2021-03)">
+          label="Eclipse for Scout Developers (2021-06)">
         <requirement
             name="epp.package.scout"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.egit.feature.group"/>
         <requirement
@@ -19652,9 +19696,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202103121200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202103171000">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -19666,9 +19710,13 @@
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="status">
+          <value>current</value>
+        </detail>
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-06/rc1/eclipse-ide-scout-developers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-scout-developers</value>
         </detail>
         <detail
             key="shortcut">
@@ -19714,9 +19762,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106031200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -19730,7 +19778,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="status">
-          <value>current</value>
+          <value>outdated</value>
         </detail>
         <detail
             key="siteURI">
@@ -21736,7 +21784,7 @@
             name="org.eclipse.rcp.feature.group"
             versionRange="[4.20.0,5.0.0)"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -21744,13 +21792,13 @@
     </version>
     <version
         name="latest.released"
-        label="Latest Release (2021-03)"
+        label="Latest Release (2021-06)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>http://archive.eclipse.org/eclipse/downloads/drops4/R-4.19-202103031800/</value>
+          <value>https://download.eclipse.org/eclipse/downloads/</value>
         </detail>
         <detail
             key="shortcut">
@@ -21759,18 +21807,18 @@
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse Platform (2021-03)">
+          label="Eclipse Platform (2021-06)">
         <requirement
             name="org.eclipse.platform.ide"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.20.0,5.0.0)"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202103171000">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -21782,6 +21830,10 @@
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="status">
+          <value>current</value>
+        </detail>
         <detail
             key="siteURI">
           <value>https://download.eclipse.org/eclipse/downloads/</value>
@@ -21804,7 +21856,7 @@
             name="org.eclipse.rcp.feature.group"
             versionRange="[4.20.0,5.0.0)"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106041001">
+            url="http://download.eclipse.org/releases/2021-06/202106161001">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -21818,7 +21870,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="status">
-          <value>current</value>
+          <value>outdated</value>
         </detail>
         <detail
             key="siteURI">
diff --git a/setups/org.eclipse.projects.setup b/setups/org.eclipse.projects.setup
index 0a08c9e1b..aeade2cf0 100644
--- a/setups/org.eclipse.projects.setup
+++ b/setups/org.eclipse.projects.setup
@@ -658,7 +658,10 @@
             label="Git (read-write)"/>
         <choice
             value="https://${github.user.id|username}@github.com/@{remoteURI}.git"
-            label="HTTPS (read-write)"/>
+            label="HTTPS (read-write)">
+          <annotation
+              source="http://www.eclipse.org/oomph/setup/MatchChoice"/>
+        </choice>
         <choice
             value="https://github.com/@{remoteURI}.git"
             label="HTTPS (read-only, anonymous)"/>
diff --git a/setups/org.eclipse.setup b/setups/org.eclipse.setup
index 468f41124..ff30c5129 100644
--- a/setups/org.eclipse.setup
+++ b/setups/org.eclipse.setup
@@ -8,7 +8,7 @@
       source="http://www.eclipse.org/oomph/setup/BrandingInfo">
     <detail
         key="notificationURI">
-      <value>https://www.eclipse.org/setups/donate/?scope=${scope}&amp;version=${scope.version}&amp;campaign=2020-06</value>
+      <value>https://www.eclipse.org/setups/donate/?scope=${scope}&amp;version=${scope.version}&amp;campaign=2021-06</value>
     </detail>
   </annotation>
   <annotation