[Releng] Accommodate Java 16.0.2 release
Ensure that the ProductCatalogGenerator generates the new order of the
products.
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 4d8b276..b7913f9 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
@@ -137,10 +137,27 @@
private static final String ECLIPSE_PLATFORM_SDK_PRODUCT_ID = "eclipse.platform.sdk";
- private static final List<String> PRODUCT_IDS = Arrays.asList(new String[] { "epp.package.java", "epp.package.jee", "epp.package.cpp", "epp.package.embedcpp",
- "epp.package.javascript", "epp.package.php", "epp.package.committers", "epp.package.dsl", "epp.package.modeling", "epp.package.rcp",
- "epp.package.testing", "epp.package.parallel", "epp.package.scout", "epp.package.rust", "org.eclipse.platform.ide", ECLIPSE_PLATFORM_SDK_PRODUCT_IDE_ID,
- "epp.package.reporting", "epp.package.android", "epp.package.automotive" });
+ private static final List<String> PRODUCT_IDS = Arrays.asList(new String[] { //
+ "epp.package.java", //
+ "epp.package.jee", //
+ "epp.package.cpp", //
+ "epp.package.embedcpp", //
+ "epp.package.php", //
+ "epp.package.committers", //
+ "epp.package.dsl", //
+ "epp.package.rcp", //
+ "epp.package.modeling", //
+ "epp.package.parallel", //
+ "epp.package.scout", //
+ "epp.package.javascript", //
+ "epp.package.testing", //
+ "epp.package.rust", //
+ "org.eclipse.platform.ide", //
+ ECLIPSE_PLATFORM_SDK_PRODUCT_IDE_ID, //
+ "epp.package.reporting", //
+ "epp.package.android", //
+ "epp.package.automotive" //
+ });
private static final String ALL_PRODUCT_ID = "all";
diff --git a/releng/org.eclipse.oomph.parent/tp/org.eclipse.oomph.tp.target b/releng/org.eclipse.oomph.parent/tp/org.eclipse.oomph.tp.target
index 69726ee..6b46cb9 100644
--- a/releng/org.eclipse.oomph.parent/tp/org.eclipse.oomph.tp.target
+++ b/releng/org.eclipse.oomph.parent/tp/org.eclipse.oomph.tp.target
@@ -23,7 +23,7 @@
<unit id="org.eclipse.userstorage.tests" version="0.0.0"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.21-I-builds"/>
<repository location="http://download.eclipse.org/egit/updates"/>
- <repository location="http://download.eclipse.org/justj/jres/16/updates/release/16.0.1"/>
+ <repository location="http://download.eclipse.org/justj/jres/16/updates/release/16.0.2"/>
<repository location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/latest"/>
<repository location="http://download.eclipse.org/mylyn/snapshots/weekly"/>
<repository location="http://download.eclipse.org/nebula/snapshot"/>
diff --git a/setups/org.eclipse.jres.setup b/setups/org.eclipse.jres.setup
index eebc0a5..c1ca497 100644
--- a/setups/org.eclipse.jres.setup
+++ b/setups/org.eclipse.jres.setup
@@ -48,7 +48,7 @@
</setupTask>
<setupTask
xsi:type="setup.p2:P2Task"
- label="JRE 16.0.1">
+ label="JRE 16.0.2">
<annotation
source="http://www.eclipse.org/oomph/setup/JRESpecificTasks">
<content
@@ -59,9 +59,9 @@
</annotation>
<requirement
name="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group"
- filter="(|(&(osgi.arch=aarch64)(osgi.os=linux))(&(osgi.arch=x86_64)(osgi.os=linux))(&(osgi.arch=x86_64)(osgi.os=macosx))(&(osgi.arch=x86_64)(osgi.os=win32)))"/>
+ filter="(|(&(osgi.arch=x86_64)(osgi.os=linux))(&(osgi.arch=aarch64)(osgi.os=linux))(&(osgi.arch=x86_64)(osgi.os=macosx))(&(osgi.arch=x86_64)(osgi.os=win32)))"/>
<repository
- url="http://download.eclipse.org/justj/jres/16/updates/release/16.0.1"/>
+ url="http://download.eclipse.org/justj/jres/16/updates/release/16.0.2"/>
<description>
Contains the plug-ins and fragments for the OpenJDK Hotspot JRE Complete.
Provides the complete set of modules of the JDK, excluding incubators.
diff --git a/setups/org.eclipse.products.setup b/setups/org.eclipse.products.setup
index eca8ba1..090121f 100644
--- a/setups/org.eclipse.products.setup
+++ b/setups/org.eclipse.products.setup
@@ -22793,6 +22793,10 @@
<annotation
source="http://www.eclipse.org/oomph/setup/BrandingInfo">
<detail
+ key="siteURI">
+ <value>https://download.eclipse.org/eclipse/downloads/</value>
+ </detail>
+ <detail
key="shortcut">
<value>Eclipse Platform - Latest</value>
</detail>
@@ -22857,6 +22861,10 @@
<annotation
source="http://www.eclipse.org/oomph/setup/BrandingInfo">
<detail
+ key="siteURI">
+ <value>https://download.eclipse.org/eclipse/downloads/</value>
+ </detail>
+ <detail
key="shortcut">
<value>Eclipse Platform - 2021-09</value>
</detail>
