From 55494a705b58edc28a9f485e237ac92194786243 Mon Sep 17 00:00:00 2001 From: Rahul Mohanan Date: Tue, 5 Sep 2023 11:27:05 +0530 Subject: [PATCH] Update product version number to 4.30 across build scripts Tracked in https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1299 --- JenkinsJobs/JobDSL.json | 4 ++-- cje-production/P-build/buildproperties.txt | 4 ++-- cje-production/Y-build/buildproperties.txt | 6 +++--- cje-production/buildproperties.txt | 6 +++--- .../eclipse-junit-tests/eclipse-junit-tests.product | 2 +- .../eclipse.platform.repository/platform.p2.inf | 10 +++++----- .../eclipse.platform.repository/platform.product | 2 +- .../eclipse.platform.repository/platform.sdk.p2.inf | 10 +++++----- .../eclipse.platform.repository/platform.sdk.product | 2 +- .../eclipse.platform.repository/rcp.product | 2 +- .../eclipse.platform.repository/rcp.sdk.product | 2 +- .../eclipse.platform.repository/sdk.p2.inf | 10 +++++----- .../eclipse.platform.repository/sdk.product | 2 +- .../equinox-sdk/equinox-sdk.product | 2 +- .../EclipseRTOSGiStarterKit.product | 2 +- .../eclipse.releng.repository.java21patch/pom.xml | 2 +- .../java21patch/org.eclipse.jdt-feature-dummy/pom.xml | 2 +- .../java21patch/org.eclipse.jdt.dummy/pom.xml | 2 +- .../java21patch/org.eclipse.jdt.java21patch/pom.xml | 2 +- .../rootfiles/.eclipseproduct | 2 +- .../configuration/streamSpecific.properties | 2 +- production/testScripts/test_runTests2.xml.sh | 2 +- scripts/updateProductVersion.sh | 8 ++++---- 23 files changed, 44 insertions(+), 44 deletions(-) diff --git a/JenkinsJobs/JobDSL.json b/JenkinsJobs/JobDSL.json index 9cb43ca9093..ac159be2606 100644 --- a/JenkinsJobs/JobDSL.json +++ b/JenkinsJobs/JobDSL.json @@ -1,8 +1,8 @@ { "Streams": [ - "4.29" + "4.30" ], "Branches": { - "4.29": "master" + "4.30": "master" } } diff --git a/cje-production/P-build/buildproperties.txt b/cje-production/P-build/buildproperties.txt index 9691ddd6543..6137aff17b6 100644 --- a/cje-production/P-build/buildproperties.txt +++ b/cje-production/P-build/buildproperties.txt @@ -22,8 +22,8 @@ PATCH_BUILD="java21patch" BUILD_TYPE_NAME="Beta Java 21" BUILD_TYPE="P" TESTED_BUILD_TYPE="P" -RELEASE_VER="4.29" -STREAM="4.29.0" +RELEASE_VER="4.30" +STREAM="4.30.0" STREAMMajor="4" STREAMMinor="29" STREAMService="0" diff --git a/cje-production/Y-build/buildproperties.txt b/cje-production/Y-build/buildproperties.txt index 435fbd8084f..a60ad860cf6 100644 --- a/cje-production/Y-build/buildproperties.txt +++ b/cje-production/Y-build/buildproperties.txt @@ -21,8 +21,8 @@ PATCH_OR_BRANCH_LABEL="java21" BUILD_TYPE_NAME="Beta Java 21" BUILD_TYPE="Y" TESTED_BUILD_TYPE="Y" -RELEASE_VER="4.29" -STREAM="4.29.0" +RELEASE_VER="4.30" +STREAM="4.30.0" STREAMMajor="4" STREAMMinor="29" STREAMService="0" @@ -40,7 +40,7 @@ LOCAL_REPO="localMavenRepo" # Base builder parameters BASEBUILDER_TAG="4.28" API_PREV_REF_LABEL="4.28" -#API_FREEZE_REF_LABEL="4.29RC1" +#API_FREEZE_REF_LABEL="4.30RC1" 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" diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt index 1a12ade51fa..02379c14309 100644 --- a/cje-production/buildproperties.txt +++ b/cje-production/buildproperties.txt @@ -21,8 +21,8 @@ PATCH_OR_BRANCH_LABEL="master" BUILD_TYPE_NAME="Integration" BUILD_TYPE="I" TESTED_BUILD_TYPE="I" -RELEASE_VER="4.29" -STREAM="4.29.0" +RELEASE_VER="4.30" +STREAM="4.30.0" STREAMMajor="4" STREAMMinor="29" STREAMService="0" @@ -40,7 +40,7 @@ LOCAL_REPO="localMavenRepo" # Base builder parameters BASEBUILDER_TAG="4.28" API_PREV_REF_LABEL="4.28" -#API_FREEZE_REF_LABEL="4.29RC1" +#API_FREEZE_REF_LABEL="4.30RC1" 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}-202208241800/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" 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 index f23ac0f8275..4429bef5594 100755 --- 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 @@ - + http://eclipse.org/legal/epl/notice.php 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 d20dd94bbb8..3e53d42509d 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.29,name:The Eclipse Project Updates);\ -addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.29,name:The Eclipse Project Updates);\ -addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2023-09,name:2023-09);\ -addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2023-09,name:2023-09);\ +addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\ +addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\ +addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\ +addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\ 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.name = org.eclipse.equinox.p2.type.product properties.0.value = true properties.1.name = org.eclipse.equinox.p2.description -properties.1.value = 4.29 Release of the Eclipse Platform. +properties.1.value = 4.30 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 index 193408ff9e8..7a384d25bfb 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product @@ -1,7 +1,7 @@ - + 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 38fb59e5094..0e11d03215e 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.29,name:The Eclipse Project Updates);\ -addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.29,name:The Eclipse Project Updates);\ -addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2023-09,name:2023-09);\ -addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2023-09,name:2023-09);\ +addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\ +addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\ +addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\ +addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\ 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.name = org.eclipse.equinox.p2.type.product properties.0.value = true properties.1.name = org.eclipse.equinox.p2.description -properties.1.value = 4.29 Release of the Platform SDK. +properties.1.value = 4.30 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/platform.sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.sdk.product index 116a4957739..bdcc51f4704 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.sdk.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.sdk.product @@ -1,7 +1,7 @@ - + diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/rcp.product b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/rcp.product index f3c09fdbb2b..485a9fd5c19 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/rcp.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/rcp.product @@ -1,7 +1,7 @@ - + diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/rcp.sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/rcp.sdk.product index 352bab506c4..b84d2647c9d 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/rcp.sdk.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/rcp.sdk.product @@ -1,7 +1,7 @@ - + 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 6b447c033c7..475a0768f35 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.29,name:The Eclipse Project Updates);\ -addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.29,name:The Eclipse Project Updates);\ -addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2023-09,name:2023-09);\ -addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2023-09,name:2023-09);\ +addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\ +addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\ +addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\ +addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\ 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.name = org.eclipse.equinox.p2.type.product properties.0.value = true properties.1.name = org.eclipse.equinox.p2.description -properties.1.value = 4.29 Release of the Eclipse SDK. +properties.1.value = 4.30 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 index 7121d551d50..e3ec8b1ae98 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product @@ -1,7 +1,7 @@ - + diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product index cb941cf2a4b..1bc360c5fbf 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product @@ -1,7 +1,7 @@ - + http://eclipse.org/legal/epl/notice.php diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product index 3921c5730ea..dc3bb104a2a 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product @@ -1,7 +1,7 @@ - + diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/pom.xml index ceccc8b72c9..81f8e430df8 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/pom.xml @@ -17,7 +17,7 @@ eclipse.platform.releng eclipse.platform.releng.java21patch - 4.29.0-SNAPSHOT + 4.30.0-SNAPSHOT ../ diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/pom.xml index 12d9ab27033..679a343602e 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.releng eclipse.platform.releng.java21patch - 4.29.0-SNAPSHOT + 4.30.0-SNAPSHOT org.eclipse.jdt.feature org.eclipse.jdt diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/pom.xml index b2d79b679c1..5f614ef7b09 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.releng eclipse.platform.releng.java21patch - 4.29.0-SNAPSHOT + 4.30.0-SNAPSHOT org.eclipse.jdt org.eclipse.jdt.dummy diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/pom.xml index c266ae496ed..04cc34ec879 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/pom.xml @@ -17,7 +17,7 @@ eclipse.platform.releng eclipse.platform.releng.java21patch - 4.29.0-SNAPSHOT + 4.30.0-SNAPSHOT org.eclipse.jdt.feature org.eclipse.jdt.java21patch diff --git a/eclipse.platform.releng/features/org.eclipse.platform-feature/rootfiles/.eclipseproduct b/eclipse.platform.releng/features/org.eclipse.platform-feature/rootfiles/.eclipseproduct index a7a7942d24e..637f3f78268 100644 --- a/eclipse.platform.releng/features/org.eclipse.platform-feature/rootfiles/.eclipseproduct +++ b/eclipse.platform.releng/features/org.eclipse.platform-feature/rootfiles/.eclipseproduct @@ -1,3 +1,3 @@ name=Eclipse Platform id=org.eclipse.platform -version=4.29.0 +version=4.30.0 diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties index f3e854112b0..136532dabd7 100644 --- a/production/testScripts/configuration/streamSpecific.properties +++ b/production/testScripts/configuration/streamSpecific.properties @@ -5,7 +5,7 @@ # purely title or identifier for display, to help confirm right file # is being retrieved and used. -streamSpecificPropertiesTitle="Properties for 4.29.0 builds and tests" +streamSpecificPropertiesTitle="Properties for 4.30.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 diff --git a/production/testScripts/test_runTests2.xml.sh b/production/testScripts/test_runTests2.xml.sh index b01e59dbbd5..d4619eb6c2c 100755 --- a/production/testScripts/test_runTests2.xml.sh +++ b/production/testScripts/test_runTests2.xml.sh @@ -81,7 +81,7 @@ wget -O ${WORKSPACE}/getEBuilder.xml --no-verbose https://${GIT_HOST}/c/platfo ANTFILE=getEBuilder.xml buildId=I20150320-0800 -eclipseStream=4.29.0 +eclipseStream=4.30.0 EBUILDER_HASH=master #EBUILDER_HASH=4295494c43e464a0c4ee39b7e0c847fbc3263f2a diff --git a/scripts/updateProductVersion.sh b/scripts/updateProductVersion.sh index 72a819ea728..a2a15c4ce97 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.28.0/4.29.0/g' {} \; -find $script_location/.. -name MANIFEST.MF -exec sed -i 's/4.28.0/4.29.0/g' {} \; -find $script_location/.. -type f -name *.product -exec sed -i 's/4.28.0/4.29.0/g' {} \; -find $script_location/.. -name feature.xml -exec sed -i 's/4.28.0/4.29.0/g' {} \; +find $script_location/.. -name pom.xml -exec sed -i 's/4.28.0/4.30.0/g' {} \; +find $script_location/.. -name MANIFEST.MF -exec sed -i 's/4.28.0/4.30.0/g' {} \; +find $script_location/.. -type f -name *.product -exec sed -i 's/4.28.0/4.30.0/g' {} \; +find $script_location/.. -name feature.xml -exec sed -i 's/4.28.0/4.30.0/g' {} \;