Update product version number to 4.35 across build scripts (#2569)

MohananRahul · web-flow · commit 50c43b74cdb1 · 2024-11-23T15:50:28.000+05:30
#2568
diff --git a/cje-production/P-build/buildproperties.txt b/cje-production/P-build/buildproperties.txt
@@ -17,15 +17,15 @@
 
 # CJE build variables
 BRANCH="master"
-PATCH_OR_BRANCH_LABEL="java23patch"
-PATCH_BUILD="java23patch"
-BUILD_TYPE_NAME="Beta Java 23"
+PATCH_OR_BRANCH_LABEL="java24patch"
+PATCH_BUILD="java24patch"
+BUILD_TYPE_NAME="Beta Java 24"
 BUILD_TYPE="P"
 TESTED_BUILD_TYPE="P"
-RELEASE_VER="4.33"
-STREAM="4.33.0"
+RELEASE_VER="4.35"
+STREAM="4.35.0"
 STREAMMajor="4"
-STREAMMinor="33"
+STREAMMinor="35"
 STREAMService="0"
 GIT_ROOT="git@github.com:"
 AGG_REPO="eclipse-platform/eclipse.platform.releng.aggregator.git"
@@ -39,7 +39,7 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
 LOCAL_REPO="localMavenRepo"
 
 # Base builder parameters
-BASEBUILDER_TAG="4.31"
+BASEBUILDER_TAG="4.34"
 API_PREV_REF_LABEL="4.31"
 
 PREVIOUS_RELEASE_VER="4.33"
diff --git a/cje-production/Y-build/buildproperties.txt b/cje-production/Y-build/buildproperties.txt
@@ -21,10 +21,10 @@ PATCH_OR_BRANCH_LABEL="java24"
 BUILD_TYPE_NAME="Beta Java 24"
 BUILD_TYPE="Y"
 TESTED_BUILD_TYPE="Y"
-RELEASE_VER="4.34"
-STREAM="4.34.0"
+RELEASE_VER="4.35"
+STREAM="4.35.0"
 STREAMMajor="4"
-STREAMMinor="34"
+STREAMMinor="35"
 STREAMService="0"
 GIT_ROOT="git@github.com:"
 AGG_REPO="eclipse-platform/eclipse.platform.releng.aggregator.git"
@@ -38,7 +38,7 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
 LOCAL_REPO="localMavenRepo"
 
 # Base builder parameters
-BASEBUILDER_TAG="4.32"
+BASEBUILDER_TAG="4.34"
 API_PREV_REF_LABEL="4.32"
 
 PREVIOUS_RELEASE_VER="4.33"
diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt
@@ -21,10 +21,10 @@ PATCH_OR_BRANCH_LABEL="master"
 BUILD_TYPE_NAME="Integration"
 BUILD_TYPE="I"
 TESTED_BUILD_TYPE="I"
-RELEASE_VER="4.34"
-STREAM="4.34.0"
+RELEASE_VER="4.35"
+STREAM="4.35.0"
 STREAMMajor="4"
-STREAMMinor="34"
+STREAMMinor="35"
 STREAMService="0"
 GIT_ROOT="git@github.com:"
 AGG_REPO="eclipse-platform/eclipse.platform.releng.aggregator.git"
@@ -41,12 +41,12 @@ LOCAL_REPO="localMavenRepo"
 BASEBUILDER_TAG="4.33"
 API_PREV_REF_LABEL="4.33"
 
-PREVIOUS_RELEASE_VER="4.33"
-PREVIOUS_RELEASE_REPO_ID="4.33"
+PREVIOUS_RELEASE_VER="4.34RC2"
+PREVIOUS_RELEASE_REPO_ID="4.34-I-builds"
 #build id for getting repo
-BASEBUILD_ID="R-4.33-202409030240"
+BASEBUILD_ID="I20241120-1800"
 #release id for downloading eclipse
-PREVIOUS_RELEASE_ID="R-4.33-202409030240"
+PREVIOUS_RELEASE_ID="S-4.34RC2-202411201800"
 
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.33.0/R-3.33.0-20240304165142/repositoryunittests/"
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
@@ -128,7 +128,7 @@
     <compare-version-with-baselines.skip>true</compare-version-with-baselines.skip>
     <version.baseline.check.skip>${compare-version-with-baselines.skip}</version.baseline.check.skip> <!-- Allows projects to overwrite the value set on the CLI to skip the check in any case. -->
     <tycho.baseline.replace>all</tycho.baseline.replace>
-    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.33/R-4.33-202409030240/</previous-release.baseline>
+    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.34-I-builds/I20241120-1800/</previous-release.baseline>
 
     <!--
       Declaration of properties that contribute to the arg line for the tycho-surefire-plugin.
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="eclipse-junit-tests" uid="eclipse-junit-tests" version="4.34.0.qualifier" type="mixed" includeLaunchers="false" autoIncludeRequirements="false">
+<product name="eclipse-junit-tests" uid="eclipse-junit-tests" version="4.35.0.qualifier" type="mixed" includeLaunchers="false" autoIncludeRequirements="false">
 
    <license>
         <url>http://eclipse.org/legal/epl/notice.php</url>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
@@ -5,10 +5,10 @@ org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux-x86_64=\${basedir
 org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildId}-win32-x86_64.zip
 org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.dmg
 
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.33-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.33-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.33-macosx-cocoa-x86_64.dmg
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.34RC2-linux-gtk-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.34RC2-win32-x86_64.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.34RC2-macosx-cocoa-x86_64.dmg
 
 org.eclipse.equinox.p2.tests.current.build.repo=https://download.eclipse.org/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId}
-org.eclipse.equinox.p2.tests.last.release.build.repo=https://download.eclipse.org/equinox/drops/R-4.33-202409030240/
+org.eclipse.equinox.p2.tests.last.release.build.repo=https://download.eclipse.org/equinox/drops/S-4.34RC2-202411201800/
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties
@@ -5,4 +5,4 @@ buildId=${buildId}
 # such as "4.5" instead of "4.5.0".
 eclipseStream=${releaseNumberSDK}
 # similar for previous release version
-previousReleaseVersion=4.33
+previousReleaseVersion=4.34RC2
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh
@@ -7,9 +7,9 @@
 
 
 mkdir -p workarea/${buildId}/eclipse-testing
-cp /home/files/buildzips/oxygen/R/R-4.33-202409030240//eclipse-platform-4.33-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+cp /home/files/buildzips/oxygen/R/S-4.34RC2-202411201800//eclipse-platform-4.34-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
 
-cp /home/files/buildzips/oxygen/R/R-4.33-202409030240//eclipse-SDK-4.33-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
+cp /home/files/buildzips/oxygen/R/S-4.34RC2-202411201800//eclipse-SDK-4.34-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
 
 cp eclipse-junit-tests-${buildId}.zip workarea/${buildId}/eclipse-testing/
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.p2.inf
@@ -9,7 +9,7 @@ update.description = An update for 4.x generation Eclipse Platform.
 
 # Set the product property type
 properties.1.name = org.eclipse.equinox.p2.description
-properties.1.value = 4.34 Release of the Eclipse Platform.
+properties.1.value = 4.35 Release of the Eclipse Platform.
 
 properties.2.name = org.eclipse.equinox.p2.provider
 properties.2.value = Eclipse.org
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse Platform" uid="org.eclipse.platform.ide" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.34.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
+<product name="Eclipse Platform" uid="org.eclipse.platform.ide" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.35.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
 
    <configIni use="default">
    </configIni>
@@ -205,8 +205,8 @@ United States, other countries, or both.
    </configurations>
 
    <repositories>
-      <repository location="https://download.eclipse.org/eclipse/updates/4.34" name="The Eclipse Project Updates" enabled="true" />
-      <repository location="https://download.eclipse.org/releases/2024-12" name="2024-12" enabled="true" />
+      <repository location="https://download.eclipse.org/eclipse/updates/4.35" name="The Eclipse Project Updates" enabled="true" />
+      <repository location="https://download.eclipse.org/releases/2025-03" name="2025-03" enabled="true" />
    </repositories>
 
 </product>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.p2.inf
@@ -9,7 +9,7 @@ update.description = An update for 4.x generation Eclipse SDK.
 
 # Set the product property type
 properties.1.name = org.eclipse.equinox.p2.description
-properties.1.value = 4.34 Release of the Eclipse SDK.
+properties.1.value = 4.35 Release of the Eclipse SDK.
 
 properties.2.name = org.eclipse.equinox.p2.provider
 properties.2.value = Eclipse.org
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse SDK" uid="org.eclipse.sdk.ide" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.34.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
+<product name="Eclipse SDK" uid="org.eclipse.sdk.ide" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.35.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
 
    <configIni use="default">
    </configIni>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product uid="org.eclipse.equinox.sdk.product" version="4.34.0.qualifier" useFeatures="true" includeLaunchers="false">
+<product uid="org.eclipse.equinox.sdk.product" version="4.35.0.qualifier" useFeatures="true" includeLaunchers="false">
 
    <license>
         <url>http://eclipse.org/legal/epl/notice.php</url>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="EclipseRT OSGi Starter Kit" uid="org.eclipse.rt.osgistarterkit.product" version="4.34.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="EclipseRT OSGi Starter Kit" uid="org.eclipse.rt.osgistarterkit.product" version="4.35.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
@@ -5,22 +5,22 @@
 
 # purely title or identifier for display, to help confirm right file
 # is being retrieved and used.
-streamSpecificPropertiesTitle="Properties for 4.34.0 builds and tests"
+streamSpecificPropertiesTitle="Properties for 4.35.0 builds and tests"
 
 # These "previousRelease" variables are primarily used to have a
 # stable version of Eclipse, that is used, for example, for it's p2
 # director, etc., so that "running the tests" is not actually using
 # the "just built" versions.
-previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.33-202409030240/
+previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.34RC2-202411201800/
 # version here is "build label" ... in general form, the "middle" of archive name,
 # such as  "eclipse-platform-${previousReleaseVersion}-linux-gtk-x86_64.tar.gz
 # Also used used in p2 testing?
-previousReleaseVersion=4.33
+previousReleaseVersion=4.34RC2
 # This is last segment of last release repo, such as in
 #  http://${ARCHIVE_HOST}/eclipse/updates/${previousReleaseVersion}
 # NOTE: I am assuming the "composite" repo is suitable for p2. In theory,
 # they might want the simple repo, such as at 4.4/R-4.4.1-201409250400
-previousReleaseVersionRepo=4.33
+previousReleaseVersionRepo=4.34-I-builds
 
 # Note: API tests needs the _base_ of previous release, and also the previous service release
 # Bug 378587 - update releng tests (data) to go work against previous release
@@ -34,12 +34,12 @@ apiTestsPreviousRefererenceWin32Filename=obsoleteAndNotUsed
 # baselinePerf=true
 # are specified. The baselinePerf will often be the same as "previous release", but
 # not necessarily, so is not hard coded in assumptions.
-baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.33-202409030240
+baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.34RC2-202411201800
 # NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh
-baselinePerfVersion=R-4.33-202409030240
+baselinePerfVersion=S-4.34RC2-202411201800
 # TODO: could/should eventually "compute" label, from full version?
-baselinePerfVersionLabel=4.33
-baselinePerfBuildId=R-4.33-202409030240
+baselinePerfVersionLabel=4.34
+baselinePerfBuildId=I20241120-1800
 
 # We currently set here, but would be better to compute this value 
 # by peeking in the "to be tested" tar file. 
diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh
@@ -295,7 +295,7 @@ then
 
   # TODO: avoid this hard coding of baseline value
   # NOTE: value must start with a letter match baselinePerfVersion in testScripts/configuration/streamSpecific.properties
-  baselineCode="R-4.33-202409030240"
+  baselineCode="S-4.34RC2-202411201800"
   # to get time stamp, first remove initial IMN:
   baselineForBuildSuffix=${buildId/[IMN]/}
   #Then remove final '-' in build id
