[Releng] Regenerate catalogs for 2021-06 release.

eclipse-oomph · Jun 15, 2021 · 30bdd94 · 30bdd94
1 parent 67b7b56
commit 30bdd94
Show file tree

Hide file tree

Showing 6 changed files with 282 additions and 198 deletions.
diff --git 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
@@ -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
@@ -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,19 +87,23 @@
     </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"
       label="4.20 - 2021-06"
       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">