Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update product version number to 4.30 across build scripts #1300

Merged
merged 1 commit into from
Sep 5, 2023
Merged

Update product version number to 4.30 across build scripts #1300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions JenkinsJobs/JobDSL.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"Streams": [
"4.29"
"4.30"
],
"Branches": {
"4.29": "master"
"4.30": "master"
}
}
4 changes: 2 additions & 2 deletions cje-production/P-build/buildproperties.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions cje-production/Y-build/buildproperties.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions cje-production/buildproperties.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.29.0.qualifier" useFeatures="true" includeLaunchers="false">
<product name="eclipse-junit-tests" uid="eclipse-junit-tests" version="4.30.0.qualifier" useFeatures="true" includeLaunchers="false">

<license>
<url>http://eclipse.org/legal/epl/notice.php</url>
Expand Down
10 changes: 5 additions & 5 deletions eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.p2.inf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.29.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.30.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">

<configIni use="default">
</configIni>
Expand Down
10 changes: 5 additions & 5 deletions eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.sdk.p2.inf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.sdk.product
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="Eclipse Platform SDK" uid="org.eclipse.platform.sdk" id="org.eclipse.platform.sdk" application="org.eclipse.ui.ide.workbench" version="4.29.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
<product name="Eclipse Platform SDK" uid="org.eclipse.platform.sdk" id="org.eclipse.platform.sdk" application="org.eclipse.ui.ide.workbench" version="4.30.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">

<configIni use="default">
</configIni>
Expand Down
2 changes: 1 addition & 1 deletion eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/rcp.product
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="Eclipse RCP" uid="org.eclipse.rcp.id" version="4.29.0.qualifier" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true">
<product name="Eclipse RCP" uid="org.eclipse.rcp.id" version="4.30.0.qualifier" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true">

<configIni use="default">
</configIni>
Expand Down
2 changes: 1 addition & 1 deletion eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/rcp.sdk.product
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="Eclipse RCP SDK" uid="org.eclipse.rcp.sdk.id" version="4.29.0.qualifier" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true">
<product name="Eclipse RCP SDK" uid="org.eclipse.rcp.sdk.id" version="4.30.0.qualifier" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true">

<configIni use="default">
</configIni>
Expand Down
10 changes: 5 additions & 5 deletions eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.p2.inf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.29.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.30.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">

<configIni use="default">
</configIni>
Expand Down
2 changes: 1 addition & 1 deletion eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product uid="org.eclipse.equinox.sdk.product" version="4.29.0.qualifier" useFeatures="true" includeLaunchers="false">
<product uid="org.eclipse.equinox.sdk.product" version="4.30.0.qualifier" useFeatures="true" includeLaunchers="false">

<license>
<url>http://eclipse.org/legal/epl/notice.php</url>
Expand Down
2 changes: 1 addition & 1 deletion ...orm.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.29.0.qualifier" useFeatures="true" includeLaunchers="true">
<product name="EclipseRT OSGi Starter Kit" uid="org.eclipse.rt.osgistarterkit.product" version="4.30.0.qualifier" useFeatures="true" includeLaunchers="true">

<configIni use="default">
</configIni>
Expand Down
2 changes: 1 addition & 1 deletion ...form.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>eclipse.platform.releng</groupId>
<artifactId>eclipse.platform.releng.java21patch</artifactId>
<version>4.29.0-SNAPSHOT</version>
<version>4.30.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion ...pse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>eclipse.platform.releng</groupId>
<artifactId>eclipse.platform.releng.java21patch</artifactId>
<version>4.29.0-SNAPSHOT</version>
<version>4.30.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jdt.feature</groupId>
<artifactId>org.eclipse.jdt</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>eclipse.platform.releng</groupId>
<artifactId>eclipse.platform.releng.java21patch</artifactId>
<version>4.29.0-SNAPSHOT</version>
<version>4.30.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.dummy</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>eclipse.platform.releng</groupId>
<artifactId>eclipse.platform.releng.java21patch</artifactId>
<version>4.29.0-SNAPSHOT</version>
<version>4.30.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jdt.feature</groupId>
<artifactId>org.eclipse.jdt.java21patch</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion eclipse.platform.releng/features/org.eclipse.platform-feature/rootfiles/.eclipseproduct
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
name=Eclipse Platform
id=org.eclipse.platform
version=4.29.0
version=4.30.0
2 changes: 1 addition & 1 deletion production/testScripts/configuration/streamSpecific.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion production/testScripts/test_runTests2.xml.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions scripts/updateProductVersion.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' {} \;
Loading