Update installer restriction to 2024-12

- Update build launchers to 2024-12. - Update index campaign to 2024-09. - Test marketplace for 2024-12.
eclipse-oomph · Sep 11, 2024 · 04645e6 · 04645e6
1 parent 63ac955
commit 04645e6
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/...installer/src/org/eclipse/oomph/setup/internal/installer/MarketplaceCatalogGenerator.java b/...installer/src/org/eclipse/oomph/setup/internal/installer/MarketplaceCatalogGenerator.java
@@ -339,7 +339,7 @@ public void perform(Map<String, URI> nodeURIs) throws Exception
     // platformVersions.put("platform.version=4.17", "2020-09");
     // platformVersions.put("platform.version=4.18", "2020-12");
     // platformVersions.put("platform.version=4.19", "2021-03");
-    platformVersions.put("platform.version=4.20", "2021-06");
+    // platformVersions.put("platform.version=4.20", "2021-06");
     platformVersions.put("platform.version=4.21", "2021-09");
     platformVersions.put("platform.version=4.22", "2021-12");
     platformVersions.put("platform.version=4.23", "2022-03");
@@ -353,6 +353,7 @@ public void perform(Map<String, URI> nodeURIs) throws Exception
     platformVersions.put("platform.version=4.31", "2024-03");
     platformVersions.put("platform.version=4.32", "2024-06");
     platformVersions.put("platform.version=4.33", "2024-09");
+    platformVersions.put("platform.version=4.34", "2024-12");
 
     Set<URI> nodeQueryURIs = new LinkedHashSet<URI>();
     {

diff --git a/releng/org.eclipse.oomph.parent/Jenkinsfile b/releng/org.eclipse.oomph.parent/Jenkinsfile
@@ -40,7 +40,7 @@ pipeline {
 
     choice(
       name: 'RESTRICTED_VERSION',
-      choices: ['2024-09'],
+      choices: ['2024-12'],
       description: '''
         The product version for the restricted variants of the installer.
       '''

diff --git a/releng/org.eclipse.oomph.releng/Build All 64bit.launch b/releng/org.eclipse.oomph.releng/Build All 64bit.launch
@@ -11,6 +11,6 @@
     </listAttribute>
     <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
     <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${maven.build.command}"/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.id=Local&#13;&#10;-Dgit.commit=Unknown&#13;&#10;-DskipTests=true&#13;&#10;-DDtycho.debug.resolver=true&#13;&#10;-DGENERATE_SOURCE=true&#13;&#10;-DBUILD_TYPE=milestone&#13;&#10;-DRESTRICTED_VERSION=2024-09&#13;&#10;-Dmaven.artifact.threads=16&#13;&#10;-Duser.home=${system_property:user.home}&#13;&#10;-DX&#13;&#10;-DU&#13;&#10;clean&#13;&#10;verify"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.id=Local&#13;&#10;-Dgit.commit=Unknown&#13;&#10;-DskipTests=true&#13;&#10;-DDtycho.debug.resolver=true&#13;&#10;-DGENERATE_SOURCE=true&#13;&#10;-DBUILD_TYPE=milestone&#13;&#10;-DRESTRICTED_VERSION=2024-12&#13;&#10;-Dmaven.artifact.threads=16&#13;&#10;-Duser.home=${system_property:user.home}&#13;&#10;-DX&#13;&#10;-DU&#13;&#10;clean&#13;&#10;verify"/>
     <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${git.clone.oomph}"/>
 </launchConfiguration>
diff --git a/releng/org.eclipse.oomph.releng/Build Linux 64bit.launch b/releng/org.eclipse.oomph.releng/Build Linux 64bit.launch
@@ -11,6 +11,6 @@
     </listAttribute>
     <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
     <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${maven.build.command}"/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.id=Local&#13;&#10;-Dgit.commit=Unknown&#13;&#10;-DskipTests=true&#13;&#10;-Denv=linux64&#13;&#10;-DDtycho.debug.resolver=true&#13;&#10;-DGENERATE_SOURCE=true&#13;&#10;-DBUILD_TYPE=nightly&#13;&#10;-DRESTRICTED_VERSION=2024-09&#13;&#10;-Dmaven.artifact.threads=16&#13;&#10;-Duser.home=${system_property:user.home}&#13;&#10;-DX&#13;&#10;clean&#13;&#10;verify"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.id=Local&#13;&#10;-Dgit.commit=Unknown&#13;&#10;-DskipTests=true&#13;&#10;-Denv=linux64&#13;&#10;-DDtycho.debug.resolver=true&#13;&#10;-DGENERATE_SOURCE=true&#13;&#10;-DBUILD_TYPE=nightly&#13;&#10;-DRESTRICTED_VERSION=2024-12&#13;&#10;-Dmaven.artifact.threads=16&#13;&#10;-Duser.home=${system_property:user.home}&#13;&#10;-DX&#13;&#10;clean&#13;&#10;verify"/>
     <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${git.clone.oomph}"/>
 </launchConfiguration>
diff --git a/releng/org.eclipse.oomph.releng/Build Mac 64bit.launch b/releng/org.eclipse.oomph.releng/Build Mac 64bit.launch
@@ -11,6 +11,6 @@
     </listAttribute>
     <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
     <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${maven.build.command}"/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.id=Local&#13;&#10;-Dgit.commit=Unknown&#13;&#10;-DskipTests=true&#13;&#10;-Denv=mac64&#13;&#10;-DDtycho.debug.resolver=true&#13;&#10;-DGENERATE_SOURCE=true&#13;&#10;-DBUILD_TYPE=nightly&#13;&#10;-DRESTRICTED_VERSION=2024-09&#13;&#10;-Dmaven.artifact.threads=16&#13;&#10;-Duser.home=${system_property:user.home}&#13;&#10;-DX&#13;&#10;clean&#13;&#10;verify"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.id=Local&#13;&#10;-Dgit.commit=Unknown&#13;&#10;-DskipTests=true&#13;&#10;-Denv=mac64&#13;&#10;-DDtycho.debug.resolver=true&#13;&#10;-DGENERATE_SOURCE=true&#13;&#10;-DBUILD_TYPE=nightly&#13;&#10;-DRESTRICTED_VERSION=2024-12&#13;&#10;-Dmaven.artifact.threads=16&#13;&#10;-Duser.home=${system_property:user.home}&#13;&#10;-DX&#13;&#10;clean&#13;&#10;verify"/>
     <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${git.clone.oomph}"/>
 </launchConfiguration>
diff --git a/releng/org.eclipse.oomph.releng/Build Windows 64bit.launch b/releng/org.eclipse.oomph.releng/Build Windows 64bit.launch
@@ -11,6 +11,6 @@
     </listAttribute>
     <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
     <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${maven.build.command}"/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-U&#13;&#10;-Dbuild.id=Local&#13;&#10;-Dgit.commit=Unknown&#13;&#10;-DskipTests=false&#13;&#10;-Denv=win64&#13;&#10;-DDtycho.debug.resolver=true&#13;&#10;-DGENERATE_SOURCE=true&#13;&#10;-DBUILD_TYPE=nightly&#13;&#10;-DRESTRICTED_VERSION=2024-09&#13;&#10;-Dmaven.artifact.threads=16&#13;&#10;-Duser.home=${system_property:user.home}&#13;&#10;-DX&#13;&#10;clean&#13;&#10;verify"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-U&#13;&#10;-Dbuild.id=Local&#13;&#10;-Dgit.commit=Unknown&#13;&#10;-DskipTests=false&#13;&#10;-Denv=win64&#13;&#10;-DDtycho.debug.resolver=true&#13;&#10;-DGENERATE_SOURCE=true&#13;&#10;-DBUILD_TYPE=nightly&#13;&#10;-DRESTRICTED_VERSION=2024-12&#13;&#10;-Dmaven.artifact.threads=16&#13;&#10;-Duser.home=${system_property:user.home}&#13;&#10;-DX&#13;&#10;clean&#13;&#10;verify"/>
     <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${git.clone.oomph}"/>
 </launchConfiguration>
diff --git 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/sponsor/?scope=${scope}&amp;version=${scope.version}&amp;campaign=2024-06</value>
+      <value>https://www.eclipse.org/setups/sponsor/?scope=${scope}&amp;version=${scope.version}&amp;campaign=2024-09</value>
     </detail>
   </annotation>
   <annotation