From 8c13f61307ca07a0ff66f755716cb6a98e9fcb4d Mon Sep 17 00:00:00 2001
From: Rahul Mohanan <121536011+MohananRahul@users.noreply.github.com>
Date: Mon, 27 Nov 2023 16:41:14 +0530
Subject: [PATCH] Fixver (#1581)

* Move previous version to 4.30RC2 across build scripts

https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1557

* Updated RC2version
---
 cje-production/Y-build/buildproperties.txt         |  4 ++--
 eclipse-platform-parent/pom.xml                    |  2 +-
 .../bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt |  2 +-
 .../platformOptions.txt                            |  2 +-
 .../src/main/resources/equinoxp2tests.properties   |  8 ++++----
 .../src/main/resources/label.properties            |  2 +-
 .../src/main/scripts/getPreviousRelease.sh         |  4 ++--
 .../configuration/streamSpecific.properties        | 14 +++++++-------
 production/testScripts/updateTestResultsPages.sh   |  2 +-
 scripts/updateProductVersion.sh                    |  8 ++++----
 10 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/cje-production/Y-build/buildproperties.txt b/cje-production/Y-build/buildproperties.txt
index c29b1b71255..62070a8f8cf 100644
--- a/cje-production/Y-build/buildproperties.txt
+++ b/cje-production/Y-build/buildproperties.txt
@@ -22,9 +22,9 @@ BUILD_TYPE_NAME="Beta Java 21"
 BUILD_TYPE="Y"
 TESTED_BUILD_TYPE="Y"
 RELEASE_VER="4.30"
-STREAM="4.30.0"
+STREAM="4.31.0"
 STREAMMajor="4"
-STREAMMinor="30"
+STREAMMinor="31"
 STREAMService="0"
 GIT_ROOT="git@github.com:"
 AGG_REPO="eclipse-platform/eclipse.platform.releng.aggregator.git"
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index cd25230eb53..943305f1652 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -140,7 +140,7 @@
     <tycho.mapP2Dependencies>false</tycho.mapP2Dependencies>
     
     <compare-version-with-baselines.skip>true</compare-version-with-baselines.skip>
-    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.29/R-4.29-202309031000/</previous-release.baseline>
+    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.30-I-builds/I20231123-1700/</previous-release.baseline>
 
     <!--
       Declaration of properties that contribute to the arg line for the tycho-surefire-plugin.
diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt
index 8960d7a2021..4db95ba5ec6 100644
--- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt
+++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt
@@ -101,7 +101,7 @@
 -splitIndex
 -windowtitle "Eclipse JDT API Specification"
 -doctitle "Eclipse JDT API Specification"
--header "<span style='font-size:small'><b>Eclipse JDT</b><br>2023-12 (4.30)</span>"
+-header "<span style='font-size:small'><b>Eclipse JDT</b><br>2024-03 (4.31)</span>"
 -bottom "<br><span style='font-size:small;float:right'>Copyright (c) 2000, 2023 Eclipse Contributors and others. All rights reserved.</span><span style='font-size:small'><a href='{@docRoot}/../misc/api-usage-rules.html'>Guidelines for using Eclipse APIs.</a></span>"
 -group "Java development tools core packages" "org.eclipse.jdt.core
 ;org.eclipse.jdt.core.*"
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
index f4da8e10dd5..5c3a6cb09d3 100644
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
@@ -195,7 +195,7 @@
 -splitIndex
 -windowtitle "Eclipse Platform API Specification"
 -doctitle "Eclipse Platform API Specification"
--header "<span style='font-size:small'><b>Eclipse Platform</b><br>2023-12 (4.30)</span>"
+-header "<span style='font-size:small'><b>Eclipse Platform</b><br>2024-03 (4.31)</span>"
 -bottom "<br><span style='font-size:small;float:right'>Copyright (c) 2000, 2023 Eclipse Contributors and others. All rights reserved.</span><span style='font-size:small'><a href='{@docRoot}/../misc/api-usage-rules.html'>Guidelines for using Eclipse APIs.</a></span>"
 -link https://docs.oracle.com/en/java/javase/17/docs/api
 -link https://docs.osgi.org/javadoc/osgi.core/8.0.0/
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
index cf3afb59749..ba8e2a7811e 100644
--- 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.29-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.29-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.29-macosx-cocoa-x86_64.dmg
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.30RC2-linux-gtk-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.30RC2-win32-x86_64.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.30RC2-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.29-202309031000/
+org.eclipse.equinox.p2.tests.last.release.build.repo=https://download.eclipse.org/equinox/drops/S-4.30RC2-202311231700/
 
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
index 1589843e0f3..5b3636557c0 100644
--- 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.29
+previousReleaseVersion=4.30RC2
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
index 489f1ff0a6b..ec0422c41bc 100755
--- 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.29-202309031000//eclipse-platform-4.29-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+cp /home/files/buildzips/oxygen/R/S-4.30RC2-202311231700//eclipse-platform-4.30RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
 
-cp /home/files/buildzips/oxygen/R/R-4.29-202309031000//eclipse-SDK-4.29-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
+cp /home/files/buildzips/oxygen/R/S-4.30RC2-202311231700//eclipse-SDK-4.30RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
 
 cp eclipse-junit-tests-${buildId}.zip workarea/${buildId}/eclipse-testing/
 
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index 234bb4d191c..8705bef42e3 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -11,16 +11,16 @@ streamSpecificPropertiesTitle="Properties for 4.31.0 builds and tests"
 # 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.29-202309031000/
+previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.30RC2-202311231700/
 # 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.29
+previousReleaseVersion=4.30RC2
 # 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.29
+previousReleaseVersionRepo=4.30-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.29-202309031000
+baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.30RC2-202311231700
 # NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh
-baselinePerfVersion=R-4.29-202309031000
+baselinePerfVersion=S-4.30RC2-202311231700
 # TODO: could/should eventually "compute" label, from full version?
-baselinePerfVersionLabel=4.29
-baselinePerfBuildId=I20230903-1000
+baselinePerfVersionLabel=4.30
+baselinePerfBuildId=I20231123-1700
 
 # 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
index d4ca5eb39e8..9453df6e14a 100755
--- 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.29-202309031000"
+  baselineCode="S-4.30RC2-202311231700"
   # to get time stamp, first remove initial IMN:
   baselineForBuildSuffix=${buildId/[IMN]/}
   #Then remove final '-' in build id
diff --git a/scripts/updateProductVersion.sh b/scripts/updateProductVersion.sh
index 08bf5e20c89..0cc83e8413e 100755
--- a/scripts/updateProductVersion.sh
+++ b/scripts/updateProductVersion.sh
@@ -15,7 +15,7 @@
 
 script_location=$( (cd $(dirname $0) && pwd) )
 
-find $script_location/.. -name pom.xml -exec sed -i 's/4.29.0/4.31.0/g' {} \;
-find $script_location/.. -name MANIFEST.MF -exec sed -i 's/4.29.0/4.31.0/g' {} \;
-find $script_location/.. -type f -name *.product -exec sed -i 's/4.29.0/4.31.0/g' {} \;
-find $script_location/.. -name feature.xml -exec sed -i 's/4.29.0/4.31.0/g' {} \;
+find $script_location/.. -name pom.xml -exec sed -i 's/4.30.0/4.31.0/g' {} \;
+find $script_location/.. -name MANIFEST.MF -exec sed -i 's/4.30.0/4.31.0/g' {} \;
+find $script_location/.. -type f -name *.product -exec sed -i 's/4.30.0/4.31.0/g' {} \;
+find $script_location/.. -name feature.xml -exec sed -i 's/4.30.0/4.31.0/g' {} \;