Regenerate catalogs for real 2024-03 repositories

eclipse-oomph · Dec 6, 2023 · c760373 · c760373
1 parent f5213bd
commit c760373
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 101 deletions.
diff --git 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-17"/>
-    <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-12&#13;&#10;https://download.eclipse.org/technology/epp/packages/2023-12/202312011200&#13;&#10;https://download.eclipse.org/releases/2023-12/202312061001&#13;&#10;https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110&#13;&#10;-useComposite 2024-03&#13;&#10;-xlatestReleased&#13;&#10;-fakeNextRelease&#13;&#10;-brandingNotification&#13;&#10;-siteURI https://www.eclipse.org/downloads/packages/release/2023-12/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-12&#13;&#10;https://download.eclipse.org/technology/epp/packages/2023-12/202312011200&#13;&#10;https://download.eclipse.org/releases/2023-12/202312061001&#13;&#10;https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110&#13;&#10;-useComposite 2024-03&#13;&#10;-xlatestReleased&#13;&#10;-xfakeNextRelease&#13;&#10;-brandingNotification&#13;&#10;-siteURI https://www.eclipse.org/downloads/packages/release/2023-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"/>

diff --git a/setups/Oomph.setup b/setups/Oomph.setup
@@ -51,6 +51,8 @@
         name="org.eclipse.swtbot.eclipse.test.junit.feature.group"/>
     <requirement
         name="org.eclipse.oomph.setup.launching.feature.group"/>
+    <requirement
+        name="org.eclipse.oomph.preferences.feature.group"/>
     <repository
         url="https://download.eclipse.org/modeling/emf/emf/builds/nightly/latest"/>
     <repository

diff --git a/setups/org.eclipse.all.product.setup b/setups/org.eclipse.all.product.setup
@@ -56,10 +56,6 @@
         <value>Eclipse Eierlegende Wollmilchsau - Latest</value>
       </detail>
     </annotation>
-    <setupTask
-        xsi:type="setup:RedirectionTask"
-        sourceURL="https://download.eclipse.org/releases/2024-03"
-        targetURL="https://download.eclipse.org/releases/2023-12"/>
     <setupTask
         xsi:type="setup.p2:P2Task"
         label="Eclipse Eierlegende Wollmilchsau (2024-03)">
@@ -170,10 +166,6 @@
         <value>Eclipse Eierlegende Wollmilchsau - 2024-03</value>
       </detail>
     </annotation>
-    <setupTask
-        xsi:type="setup:RedirectionTask"
-        sourceURL="https://download.eclipse.org/staging/2024-03"
-        targetURL="https://download.eclipse.org/staging/2023-12"/>
     <setupTask
         xsi:type="setup.p2:P2Task"
         label="Eclipse Eierlegende Wollmilchsau (2024-03)">
@@ -226,10 +218,6 @@
         <value>Eclipse Eierlegende Wollmilchsau - 2024-03</value>
       </detail>
     </annotation>
-    <setupTask
-        xsi:type="setup:RedirectionTask"
-        sourceURL="https://download.eclipse.org/releases/2024-03"
-        targetURL="https://download.eclipse.org/releases/2023-12"/>
     <setupTask
         xsi:type="setup.p2:P2Task"
         label="Eclipse Eierlegende Wollmilchsau (2024-03)">