commit 9327d370610a4b842d7eb354b564cbb9d3769547
author Ed Merks <ed.merks@gmail.com> Mon Dec 12 08:14:13 2022 +0100
committer Ed Merks <ed.merks@gmail.com> Mon Dec 12 08:14:13 2022 +0100
tree ab2dad6effedfc4fc9ad8b3cc03785b3d4b09867
parent 78262017fd34b3f404bee198c2373bbaba0c88fc

[Releng] Change product catalog generator to deal with cdo error in EPP

plugins/org.eclipse.oomph.setup.installer/ProductCatalogGenerator.launch

diff --git a/plugins/org.eclipse.oomph.setup.installer/ProductCatalogGenerator.launch b/plugins/org.eclipse.oomph.setup.installer/ProductCatalogGenerator.launch
index 6b9e767..2800415 100644
--- a/plugins/org.eclipse.oomph.setup.installer/ProductCatalogGenerator.launch
+++ b/plugins/org.eclipse.oomph.setup.installer/ProductCatalogGenerator.launch
@@ -29,7 +29,7 @@
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog &#13;&#10;-outputLocation ${file_uri:${resource_loc:/setups/org.eclipse.products.setup}}&#13;&#10;-staging 2022-12&#13;&#10;https://download.eclipse.org/technology/epp/packages/2022-12&#13;&#10;https://download.eclipse.org/releases/2022-12&#13;&#10;-useComposite 2022-12&#13;&#10;-xlatestReleased&#13;&#10;-xfakeNextRelease&#13;&#10;-brandingNotification&#13;&#10;-xsiteURI https://www.eclipse.org/downloads/packages/release/2022-09/r&#13;&#10;-xupdateCertificates&#13;&#10;-actual"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog &#13;&#10;-outputLocation ${file_uri:${resource_loc:/setups/org.eclipse.products.setup}}&#13;&#10;-staging 2023-03&#13;&#10;https://download.eclipse.org/technology/epp/packages/2023-03&#13;&#10;https://download.eclipse.org/releases/2023-03&#13;&#10;-useComposite 2023-03&#13;&#10;-xlatestReleased&#13;&#10;-xfakeNextRelease&#13;&#10;-brandingNotification&#13;&#10;-siteURI https://www.eclipse.org/downloads/packages/release/2022-12/r&#13;&#10;-xupdateCertificates&#13;&#10;-actual"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.p2.mirrors=false&#13;&#10;-Dxorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient45&#13;&#10;-Doomph.p2.repository.retry=2&#13;&#10;-Dxorg.eclipse.ecf.core.util.traceAll=true&#13;&#10;-Dxorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog&#13;&#10;-Dxorg.apache.commons.logging.simplelog.showdatetime=true&#13;&#10;-Dxorg.apache.commons.logging.simplelog.log.org.apache.http=DEBUG&#13;&#10;-Dxorg.apache.commons.logging.simplelog.log.org.apache.http.wire=ERROR&#13;&#10;-Duser.home=${system_property:user.home}"/>
     <stringAttribute key="pde.version" value="3.3"/>

plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductCatalogGenerator.java

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 bc04ef2..6275b9d 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
@@ -427,7 +427,7 @@
   private String[] getTrains()
   {
     return new String[] { "juno", "kepler", "luna", "mars", "neon", "oxygen", "photon", "2018-09", "2018-12", "2019-03", "2019-06", "2019-09", "2019-12",
-        "2020-03", "2020-06", "2020-09", "2020-12", "2021-03", "2021-06", "2021-09", "2021-12", "2022-03", "2022-06", "2022-09", "2022-12" };
+        "2020-03", "2020-06", "2020-09", "2020-12", "2021-03", "2021-06", "2021-09", "2021-12", "2022-03", "2022-06", "2022-09", "2022-12", "2023-03" };
   }
 
   private URI getEclipsePlatformSite(String train)
@@ -2032,6 +2032,11 @@
         for (String id : rootInstallIUs)
         {
           Requirement requirement = P2Factory.eINSTANCE.createRequirement();
+          if ("2022-12".equals(train) && "org.eclipse.emf.cdo.epp.feature.group".equals(id))
+          {
+            id = "org.eclipse.emf.cdo.sdk.feature.group";
+          }
+
           requirement.setName(id);
           requirements.add(requirement);
         }

setups/org.eclipse.products.setup

diff --git a/setups/org.eclipse.products.setup b/setups/org.eclipse.products.setup
index efb8f4a..b0cbc98 100644
--- a/setups/org.eclipse.products.setup
+++ b/setups/org.eclipse.products.setup
@@ -20026,7 +20026,7 @@
         <requirement
             name="org.eclipse.egit.feature.group"/>
         <requirement
-            name="org.eclipse.emf.cdo.epp.feature.group"/>
+            name="org.eclipse.emf.cdo.sdk.feature.group"/>
         <requirement
             name="org.eclipse.emf.compare.diagram.sirius.source.feature.group"/>
         <requirement
@@ -20216,7 +20216,7 @@
         <requirement
             name="org.eclipse.egit.feature.group"/>
         <requirement
-            name="org.eclipse.emf.cdo.epp.feature.group"/>
+            name="org.eclipse.emf.cdo.sdk.feature.group"/>
         <requirement
             name="org.eclipse.emf.compare.diagram.sirius.source.feature.group"/>
         <requirement