Update product version number to 4.23 across build script
Change-Id: I292f04cea42978717a25e3c8994f6b54897d4005
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.releng.aggregator/+/188138
diff --git a/cje-production/P-build/buildproperties.txt b/cje-production/P-build/buildproperties.txt
index dfda3cd..30f2ac2 100644
--- 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="java17patch"
-PATCH_BUILD="java17patch"
-BUILD_TYPE_NAME="Beta Java 17"
+PATCH_OR_BRANCH_LABEL="java18patch"
+PATCH_BUILD="java18patch"
+BUILD_TYPE_NAME="Beta Java 18"
BUILD_TYPE="P"
TESTED_BUILD_TYPE="P"
-RELEASE_VER="4.22"
-STREAM="4.22.0"
+RELEASE_VER="4.23"
+STREAM="4.23.0"
STREAMMajor="4"
-STREAMMinor="22"
+STREAMMinor="23"
STREAMService="0"
GIT_ROOT="ssh://genie.releng@git.eclipse.org:29418"
AGG_REPO="/platform/eclipse.platform.releng.aggregator.git"
@@ -39,26 +39,26 @@
LOCAL_REPO="localMavenRepo"
# Base builder parameters
-BASEBUILDER_TAG="4.21"
-API_PREV_REF_LABEL="4.21"
-#API_FREEZE_REF_LABEL="4.22RC1"
+BASEBUILDER_TAG="4.22"
+API_PREV_REF_LABEL="4.22"
+#API_FREEZE_REF_LABEL="4.23RC1"
API_FREEZE_REF_LABEL=""
# Change to appropriate versions and uncomment when entering API freeze
#FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-${API_FREEZE_REF_LABEL}-202108251800/eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip -DfreezeName=Eclipse-SDK-${API_FREEZE_REF_LABEL} -DfreezeFilename=eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip"
# Otherwise set to a blank space
FREEZE_PARAMS=" "
-PREVIOUS_RELEASE_VER="4.21"
-PREVIOUS_RELEASE_REPO_ID="4.21"
+PREVIOUS_RELEASE_VER="4.22"
+PREVIOUS_RELEASE_REPO_ID="4.22"
#build id for getting repo
-BASEBUILD_ID="R-4.21-202109060500"
+BASEBUILD_ID="R-4.22-202111241800"
#release id for downloading eclipse
-PREVIOUS_RELEASE_ID="R-4.21-202109060500"
+PREVIOUS_RELEASE_ID="R-4.22-202111241800"
BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.22.0/R-3.22.0-20210612170523/repositoryunittests/"
BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder"
-ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.22-I-builds/"
+ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.23-I-builds/"
#Maven parameters
MAVEN_OPTS="-Xmx6G"
diff --git a/cje-production/Y-build/buildproperties.txt b/cje-production/Y-build/buildproperties.txt
index 03121b4..53628ab 100644
--- a/cje-production/Y-build/buildproperties.txt
+++ b/cje-production/Y-build/buildproperties.txt
@@ -17,14 +17,14 @@
# CJE build variables
BRANCH="master"
-PATCH_OR_BRANCH_LABEL="java17"
-BUILD_TYPE_NAME="Beta Java 17"
+PATCH_OR_BRANCH_LABEL="java18"
+BUILD_TYPE_NAME="Beta Java 18"
BUILD_TYPE="Y"
TESTED_BUILD_TYPE="Y"
-RELEASE_VER="4.22"
-STREAM="4.22.0"
+RELEASE_VER="4.23"
+STREAM="4.23.0"
STREAMMajor="4"
-STREAMMinor="22"
+STREAMMinor="23"
STREAMService="0"
GIT_ROOT="ssh://genie.releng@git.eclipse.org:29418"
AGG_REPO="/platform/eclipse.platform.releng.aggregator.git"
@@ -38,26 +38,26 @@
LOCAL_REPO="localMavenRepo"
# Base builder parameters
-BASEBUILDER_TAG="4.21"
-API_PREV_REF_LABEL="4.21"
-#API_FREEZE_REF_LABEL="4.22RC1"
+BASEBUILDER_TAG="4.22"
+API_PREV_REF_LABEL="4.22"
+#API_FREEZE_REF_LABEL="4.23RC1"
API_FREEZE_REF_LABEL=""
# Change to appropriate versions and uncomment when entering API freeze
#FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-${API_FREEZE_REF_LABEL}-202108251800/eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip -DfreezeName=Eclipse-SDK-${API_FREEZE_REF_LABEL} -DfreezeFilename=eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip"
# Otherwise set to a blank space
FREEZE_PARAMS=" "
-PREVIOUS_RELEASE_VER="4.21"
-PREVIOUS_RELEASE_REPO_ID="4.21"
+PREVIOUS_RELEASE_VER="4.22"
+PREVIOUS_RELEASE_REPO_ID="4.22"
#build id for getting repo
-BASEBUILD_ID="R-4.21-202109060500"
+BASEBUILD_ID="R-4.22-202111241800"
#release id for downloading eclipse
-PREVIOUS_RELEASE_ID="R-4.21-202109060500"
+PREVIOUS_RELEASE_ID="R-4.22-202111241800"
BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.22.0/R-3.22.0-20210612170523/repositoryunittests/"
BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder"
-ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.22-I-builds/"
+ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.23-I-builds/"
#Maven parameters
MAVEN_OPTS="-Xmx6G"
diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt
index f464958..32973b0 100644
--- a/cje-production/buildproperties.txt
+++ b/cje-production/buildproperties.txt
@@ -21,10 +21,10 @@
BUILD_TYPE_NAME="Integration"
BUILD_TYPE="I"
TESTED_BUILD_TYPE="I"
-RELEASE_VER="4.22"
-STREAM="4.22.0"
+RELEASE_VER="4.23"
+STREAM="4.23.0"
STREAMMajor="4"
-STREAMMinor="22"
+STREAMMinor="23"
STREAMService="0"
GIT_ROOT="ssh://genie.releng@git.eclipse.org:29418"
AGG_REPO="/platform/eclipse.platform.releng.aggregator.git"
@@ -38,21 +38,21 @@
LOCAL_REPO="localMavenRepo"
# Base builder parameters
-BASEBUILDER_TAG="4.21"
-API_PREV_REF_LABEL="4.21"
-#API_FREEZE_REF_LABEL="4.22RC1"
+BASEBUILDER_TAG="4.22"
+API_PREV_REF_LABEL="4.22"
+#API_FREEZE_REF_LABEL="4.23RC1"
API_FREEZE_REF_LABEL=""
# Change to appropriate versions and uncomment when entering API freeze
#FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-${API_FREEZE_REF_LABEL}-202108251800/eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip -DfreezeName=Eclipse-SDK-${API_FREEZE_REF_LABEL} -DfreezeFilename=eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip"
# Otherwise set to a blank space
FREEZE_PARAMS=" "
-PREVIOUS_RELEASE_VER="4.21"
-PREVIOUS_RELEASE_REPO_ID="4.21"
+PREVIOUS_RELEASE_VER="4.22RC2"
+PREVIOUS_RELEASE_REPO_ID="4.22-I-builds"
#build id for getting repo
-BASEBUILD_ID="R-4.21-202109060500"
+BASEBUILD_ID="I20211124-1800"
#release id for downloading eclipse
-PREVIOUS_RELEASE_ID="R-4.21-202109060500"
+PREVIOUS_RELEASE_ID="S-4.22RC2-202111241800"
BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.22.0/R-3.22.0-20210612170523/repositoryunittests/"
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index e873fe1..04de8b7 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -49,7 +49,7 @@
such as Version: Mars (4.5), for main features.
See bug 328139.
-->
- <releaseName>2021-12</releaseName>
+ <releaseName>2022-03</releaseName>
<!--
The releaseNumbers below, for SDK and Platform, might be
thought of as the "marketing number" or "branding number",
@@ -64,8 +64,8 @@
but we'd still want the "marketing number" to be increased to reflect
"a new yearly release".
-->
- <releaseNumberSDK>4.22</releaseNumberSDK>
- <releaseNumberPlatform>4.22</releaseNumberPlatform>
+ <releaseNumberSDK>4.23</releaseNumberSDK>
+ <releaseNumberPlatform>4.23</releaseNumberPlatform>
<!-- using released version (normal case)
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.p2.inf
index cd87ccf..6205920 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.p2.inf
@@ -1,8 +1,8 @@
instructions.configure=\
-addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.22,name:The Eclipse Project Updates);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.22,name:The Eclipse Project Updates);\
-addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2021-12,name:2021-12);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2021-12,name:2021-12);\
+addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.23,name:The Eclipse Project Updates);\
+addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.23,name:The Eclipse Project Updates);\
+addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2022-03,name:2022-03);\
+addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2022-03,name:2022-03);\
mkdir(path:${installFolder}/dropins);
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=toolingorg.eclipse.platform.configuration.macosx
@@ -51,7 +51,7 @@
properties.0.value = true
properties.1.name = org.eclipse.equinox.p2.description
-properties.1.value = 4.22 Release of the Eclipse Platform.
+properties.1.value = 4.23 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.sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.sdk.p2.inf
index 33d9da9..4f34559 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.sdk.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.sdk.p2.inf
@@ -1,8 +1,8 @@
instructions.configure=\
-addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.22,name:The Eclipse Project Updates);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.22,name:The Eclipse Project Updates);\
-addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2021-12,name:2021-12);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2021-12,name:2021-12);\
+addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.23,name:The Eclipse Project Updates);\
+addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.23,name:The Eclipse Project Updates);\
+addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2022-03,name:2022-03);\
+addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2022-03,name:2022-03);\
mkdir(path:${installFolder}/dropins);
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=toolingorg.eclipse.configuration.macosx
@@ -49,7 +49,7 @@
properties.0.value = true
properties.1.name = org.eclipse.equinox.p2.description
-properties.1.value = 4.22 Release of the Platform SDK.
+properties.1.value = 4.23 Release of the Platform 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.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.p2.inf
index e07ce46..4bf255c 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.p2.inf
@@ -1,8 +1,8 @@
instructions.configure=\
-addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.22,name:The Eclipse Project Updates);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.22,name:The Eclipse Project Updates);\
-addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2021-12,name:2021-12);\
-addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2021-12,name:2021-12);\
+addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.23,name:The Eclipse Project Updates);\
+addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.23,name:The Eclipse Project Updates);\
+addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2022-03,name:2022-03);\
+addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2022-03,name:2022-03);\
mkdir(path:${installFolder}/dropins);
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=toolingorg.eclipse.sdk.configuration.macosx
@@ -49,7 +49,7 @@
properties.0.value = true
properties.1.name = org.eclipse.equinox.p2.description
-properties.1.value = 4.22 Release of the Eclipse SDK.
+properties.1.value = 4.23 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/apiexclude/exclude_list.txt b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/apiexclude/exclude_list.txt
index 10ad815..e493703 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/apiexclude/exclude_list.txt
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/apiexclude/exclude_list.txt
@@ -1,4 +1,4 @@
-# List of approved API changes after 4.22 RC1
+# List of approved API changes after 4.23 RC1
# The unapproved entry exclude list can be copied from <build>/buildlogs/mb080_publish-eclipse_output.txt
# Search for: Potential exclude list:
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index 9e6a32a..f0d8743 100644
--- 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.22.0 builds and tests"
+streamSpecificPropertiesTitle="Properties for 4.23.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.21-202109060500/
+previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.22RC2-202111241800/
# 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.21
+previousReleaseVersion=4.22RC2
# 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.21
+previousReleaseVersionRepo=4.22-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 @@
# 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.21-202109060500
+baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.22RC2-202111241800
# NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh
-baselinePerfVersion=R-4.21-202109060500
+baselinePerfVersion=S-4.22RC2-202111241800
# TODO: could/should eventually "compute" label, from full version?
-baselinePerfVersionLabel=4.21
-baselinePerfBuildId=I20210906-0500
+baselinePerfVersionLabel=4.22
+baselinePerfBuildId=I20211124-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/test_runTests2.xml.sh b/production/testScripts/test_runTests2.xml.sh
index 49bf0fe..46b38a1 100755
--- a/production/testScripts/test_runTests2.xml.sh
+++ b/production/testScripts/test_runTests2.xml.sh
@@ -81,7 +81,7 @@
ANTFILE=getEBuilder.xml
buildId=I20150320-0800
-eclipseStream=4.22.0
+eclipseStream=4.23.0
EBUILDER_HASH=master
#EBUILDER_HASH=4295494c43e464a0c4ee39b7e0c847fbc3263f2a
