diff options
author | Noopur Gupta | 2019-12-09 06:40:44 +0000 |
---|---|---|
committer | Noopur Gupta | 2019-12-09 10:49:09 +0000 |
commit | 93c68b344a269be0376b9e4cb78944ebc75051d5 (patch) | |
tree | 798510f490984f7d23f9d62e35b50b1ceb5f22de | |
parent | 9064c03083e481cec9732e2aebde36673b4df7d4 (diff) | |
download | eclipse.platform.releng.aggregator-93c68b344a269be0376b9e4cb78944ebc75051d5.tar.gz eclipse.platform.releng.aggregator-93c68b344a269be0376b9e4cb78944ebc75051d5.tar.xz eclipse.platform.releng.aggregator-93c68b344a269be0376b9e4cb78944ebc75051d5.zip |
Bug 553744: Update product version number to 4.15 across build scripts
Change-Id: Iebfaa134f5418693311d711d6ad8b181cd846cd1
Signed-off-by: Noopur Gupta <noopur_gupta@in.ibm.com>
14 files changed, 42 insertions, 40 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml index 13587263b..c182056fd 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>2019-12</releaseName> + <releaseName>2020-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.14</releaseNumberSDK> - <releaseNumberPlatform>4.14</releaseNumberPlatform> + <releaseNumberSDK>4.15</releaseNumberSDK> + <releaseNumberPlatform>4.15</releaseNumberPlatform> <!-- Using snapshot, or locally built (forked) snapshot version for bug 484000. diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/apiexclude/exclude_list.txt b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/apiexclude/exclude_list.txt index 20e2b6313..3cf4a6e48 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.13 RC2 +# List of approved API changes after 4.15 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/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf index 95141d2bb..93a72b91d 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf +++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf @@ -1,8 +1,8 @@ instructions.configure=\ -addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.14,name:The Eclipse Project Updates);\ -addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.14,name:The Eclipse Project Updates);\ -addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2019-12,name:2019-12);\ -addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2019-12,name:2019-12);\ +addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.15,name:The Eclipse Project Updates);\ +addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.15,name:The Eclipse Project Updates);\ +addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2020-03,name:2020-03);\ +addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2020-03,name:2020-03);\ mkdir(path:${installFolder}/dropins); requires.1.namespace=org.eclipse.equinox.p2.iu requires.1.name=toolingorg.eclipse.configuration.macosx diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf index 3d5291a23..7389f8387 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf +++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf @@ -1,8 +1,8 @@ instructions.configure=\ -addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.14,name:The Eclipse Project Updates);\ -addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.14,name:The Eclipse Project Updates);\ -addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2019-12,name:2019-12);\ -addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2019-12,name:2019-12);\ +addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.15,name:The Eclipse Project Updates);\ +addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.15,name:The Eclipse Project Updates);\ +addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2020-03,name:2020-03);\ +addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2020-03,name:2020-03);\ mkdir(path:${installFolder}/dropins); requires.1.namespace=org.eclipse.equinox.p2.iu requires.1.name=toolingorg.eclipse.platform.configuration.macosx diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf index d94b257ba..083e770d2 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf +++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf @@ -1,8 +1,8 @@ instructions.configure=\ -addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.14,name:The Eclipse Project Updates);\ -addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.14,name:The Eclipse Project Updates);\ -addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2019-12,name:2019-12);\ -addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2019-12,name:2019-12);\ +addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.15,name:The Eclipse Project Updates);\ +addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.15,name:The Eclipse Project Updates);\ +addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2020-03,name:2020-03);\ +addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2020-03,name:2020-03);\ mkdir(path:${installFolder}/dropins); requires.1.namespace=org.eclipse.equinox.p2.iu requires.1.name=toolingorg.eclipse.sdk.configuration.macosx diff --git a/production/build-functions.shsource b/production/build-functions.shsource index 6e884cfd5..c358cbe9d 100755 --- a/production/build-functions.shsource +++ b/production/build-functions.shsource @@ -1181,9 +1181,9 @@ fn-summarize-apitooling () # Make sure FREEZE_PARAMS is defined, but empty space, if not using freeze reports. FREEZE_PARAMS=" " # When no "freeze" in effect for a release comment these out. Uncomment after M6, changing to appropriate versions. - #FREEZE_PARAMS="-DfreezeBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.12RC1a-201905310245/eclipse-SDK-4.12RC1a-win32-x86_64.zip \ - # -DfreezeName=Eclipse-SDK-4.12RC1a \ - # -DfreezeFilename=eclipse-SDK-4.12RC1a-win32-x86_64.zip " + #FREEZE_PARAMS="-DfreezeBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.14RC1-201911271800/eclipse-SDK-4.14RC1-win32-x86_64.zip \ + # -DfreezeName=Eclipse-SDK-4.14RC1 \ + # -DfreezeFilename=eclipse-SDK-4.14RC1-win32-x86_64.zip " # this API_PREV_REF_LABEL variable should be changed any time the version used # by previousBaseURL changes. Its purpose is just to localize changes to this one # place, and not have to make further, hard-coded changes to php files. @@ -1191,7 +1191,7 @@ fn-summarize-apitooling () # NOTE: the *reference* for API changes should be the "previous release", even if it is a "service release". API_PREV_REF_LABEL=4.13 fn-write-property API_PREV_REF_LABEL - #API_FREEZE_REF_LABEL=4.14RC1 + #API_FREEZE_REF_LABEL=4.14RC2 API_FREEZE_REF_LABEL=" " fn-write-property API_FREEZE_REF_LABEL java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \ diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource index 8fd06a635..3da811d3f 100644 --- a/production/build_eclipse_org.shsource +++ b/production/build_eclipse_org.shsource @@ -21,7 +21,7 @@ source localBuildProperties.shsource 2>/dev/null export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds} export BRANCH=${BRANCH:-master} -export STREAM=${STREAM:-4.14.0} +export STREAM=${STREAM:-4.15.0} export BUILD_TYPE=${BUILD_TYPE:-I} # If not set be caller, make sure its an empty string diff --git a/production/createReports.sh b/production/createReports.sh index cd791e18b..606952812 100755 --- a/production/createReports.sh +++ b/production/createReports.sh @@ -67,22 +67,22 @@ function latestSimpleRepo if [[ ${build_type} == "I" ]] then - update_dir_segment="4.14-I-builds" + update_dir_segment="4.15-I-builds" buildIdToCompare="4.13/R-4.13-201909161045" echo -e "\tlatest_R_build: R-4.13-201909161045" elif [[ ${build_type} == "Y" ]] then - update_dir_segment="4.14-Y-builds" + update_dir_segment="4.15-Y-builds" # Note: we use same value for Y-builds as for I-builds, since conceptually # they are the same, except that Y-builds use some code from BETA_JAVA12 branch. - latest_I_build=$(latestSimpleRepo "${repo_root}/4.14-I-builds" "I20*") + latest_I_build=$(latestSimpleRepo "${repo_root}/4.15-I-builds" "I20*") RC=$? if [[ $RC != 0 ]] then exit $RC fi echo -e "\tlatest_I_build: $latest_I_build" - buildIdToCompare="4.14-I-builds/${latest_I_build}" + buildIdToCompare="4.15-I-builds/${latest_I_build}" else echo -e "\nERROR: Unhandled build type: ${build_type} so update_dir_segment undefined: $update_dir_segment" echo -e "\n\tand repo reports not produced." diff --git a/production/miscToolsAndNotes/checkComposites/checkComposites.sh b/production/miscToolsAndNotes/checkComposites/checkComposites.sh index 4c0a86b74..7ae182d10 100755 --- a/production/miscToolsAndNotes/checkComposites/checkComposites.sh +++ b/production/miscToolsAndNotes/checkComposites/checkComposites.sh @@ -29,12 +29,14 @@ repoHttpAccess=http://download.eclipse.org repoAccess=${repoFileAccess} # TODO: reduce this list soon repoList="\ -/eclipse/updates/4.13/ \ /eclipse/updates/4.14/ \ +/eclipse/updates/4.15/ \ +/eclipse/updates/4.15-I-builds/ \ +/eclipse/updates/4.15milestones/ \ +/eclipse/updates/4.15-Y-builds/ \ +/eclipse/updates/4.15-P-builds/ \ /eclipse/updates/4.14-I-builds/ \ /eclipse/updates/4.14milestones/ \ -/eclipse/updates/4.13-Y-builds/ \ -/eclipse/updates/4.13-P-builds/ \ " diff --git a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh index b8c180bce..2abedd6d2 100755 --- a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh +++ b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh @@ -62,15 +62,15 @@ BUILDFILESTR="-f ${BUILDFILE}" currentStream=$1 if [[ -z "${currentStream}" ]] then - printf "\n\t%s\t%s\n" "WARNING:" "Current stream version not specified on command line, assuming 4.14" - currentStream="4.14" + printf "\n\t%s\t%s\n" "WARNING:" "Current stream version not specified on command line, assuming 4.15" + currentStream="4.15" fi maintenanceStream=$2 if [[ -z "${maintenanceStream}" ]] then - printf "\n\t%s\t%s\n" "WARNING:" "Maintenance stream version not specified on command line, assuming 4.13" - maintenanceStream="4.13" + printf "\n\t%s\t%s\n" "WARNING:" "Maintenance stream version not specified on command line, assuming 4.14" + maintenanceStream="4.14" fi diff --git a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml index af6c8df03..0819280f3 100644 --- a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml +++ b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml @@ -27,10 +27,10 @@ <fail unless="currentStream" - message="currentStream (such as '4.14') must be defined for this script" /> + message="currentStream (such as '4.15') must be defined for this script" /> <fail unless="maintenanceStream" - message="maintenanceStream (such as '4.13') must be defined for this script" /> + message="maintenanceStream (such as '4.14') must be defined for this script" /> <!-- Note: we do not put stream number in 'name', since once a 'name' is defined in Eclipse's UI, it does not change. --> diff --git a/production/sdk/cleaners/cleanupNightlyRepo.sh b/production/sdk/cleaners/cleanupNightlyRepo.sh index aa1c0de24..bc1e47119 100755 --- a/production/sdk/cleaners/cleanupNightlyRepo.sh +++ b/production/sdk/cleaners/cleanupNightlyRepo.sh @@ -210,10 +210,10 @@ function cleanRepo () remoteBase="/home/data/httpd/download.eclipse.org" -eclipseIRepo="${remoteBase}/eclipse/updates/4.14-I-builds" -eclipseSRepo="${remoteBase}/eclipse/updates/4.14milestones" -eclipseYRepo="${remoteBase}/eclipse/updates/4.14-Y-builds" -eclipsePRepo="${remoteBase}/eclipse/updates/4.14-P-builds" +eclipseIRepo="${remoteBase}/eclipse/updates/4.15-I-builds" +eclipseSRepo="${remoteBase}/eclipse/updates/4.15milestones" +eclipseYRepo="${remoteBase}/eclipse/updates/4.15-Y-builds" +eclipsePRepo="${remoteBase}/eclipse/updates/4.15-P-builds" #doDryrun=dryrun doDryrun= diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties index 5ace9bd0b..21a648868 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.14.0 builds and tests" +streamSpecificPropertiesTitle="Properties for 4.15.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 2e496e74c..05e3bed90 100755 --- a/production/testScripts/test_runTests2.xml.sh +++ b/production/testScripts/test_runTests2.xml.sh @@ -86,7 +86,7 @@ wget -O ${WORKSPACE}/getEBuilder.xml --no-verbose http://${GIT_HOST}/c/platfor ANTFILE=getEBuilder.xml buildId=I20150320-0800 -eclipseStream=4.14.0 +eclipseStream=4.15.0 EBUILDER_HASH=master #EBUILDER_HASH=4295494c43e464a0c4ee39b7e0c847fbc3263f2a |