Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2019-03-08 06:32:30 -0500
committerSravan Kumar Lakkimsetti2019-03-08 06:53:53 -0500
commit78a2d95060241bf373cb7abd3abf44b245645d70 (patch)
tree39448eda40671334b8a79140ddb7e5bf9566e981
parent476453a622cc46a078cb6d5d1bc66a5e2c2ba547 (diff)
downloadeclipse.platform.releng.aggregator-78a2d95060241bf373cb7abd3abf44b245645d70.tar.gz
eclipse.platform.releng.aggregator-78a2d95060241bf373cb7abd3abf44b245645d70.tar.xz
eclipse.platform.releng.aggregator-78a2d95060241bf373cb7abd3abf44b245645d70.zip
Bug 545096 - Update product version number to 4.12 across build scripts
Change-Id: Ic2febd5059e9c4c08fbc2f664dc7c3e192e95d4b Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
-rw-r--r--eclipse-platform-parent/pom.xml6
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/apiexclude/exclude_list.txt2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf10
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf10
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf10
-rwxr-xr-xproduction/build-functions.shsource12
-rw-r--r--production/build_eclipse_org.shsource2
-rwxr-xr-xproduction/createReports.sh8
-rwxr-xr-xproduction/miscToolsAndNotes/checkComposites/checkComposites.sh8
-rwxr-xr-xproduction/miscToolsAndNotes/updaterepo/updateGenericComposites.sh4
-rw-r--r--production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml2
-rwxr-xr-xproduction/sdk/cleaners/cleanupNightlyRepo.sh8
-rw-r--r--production/testScripts/configuration/streamSpecific.properties2
-rwxr-xr-xproduction/testScripts/test_runTests2.xml.sh2
14 files changed, 44 insertions, 42 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 9f6afe51..d09ebf46 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-03</releaseName>
+ <releaseName>2019-06</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.11</releaseNumberSDK>
- <releaseNumberPlatform>4.11</releaseNumberPlatform>
+ <releaseNumberSDK>4.12</releaseNumberSDK>
+ <releaseNumberPlatform>4.12</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 a5f2a079..f23a5918 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.11 RC1
+# List of approved API changes after 4.12 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 3994cea2..7fb85b2b 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.11,name:The Eclipse Project Updates);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.11,name:The Eclipse Project Updates);\
-addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2019-03,name:2019-03);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2019-03,name:2019-03);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.12,name:The Eclipse Project Updates);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.12,name:The Eclipse Project Updates);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2019-06,name:2019-06);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2019-06,name:2019-06);\
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 = Initial 4.11 Release of the Platform SDK.
+properties.1.value = 4.12 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/platform/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
index a7234809..68353a66 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.11,name:The Eclipse Project Updates);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.11,name:The Eclipse Project Updates);\
-addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2019-03,name:2019-03);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2019-03,name:2019-03);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.12,name:The Eclipse Project Updates);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.12,name:The Eclipse Project Updates);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2019-06,name:2019-06);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2019-06,name:2019-06);\
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 = Initial 4.11 Release of the Eclipse Platform.
+properties.1.value = 4.12 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/sdk/sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
index 96dbc7f2..e0b1f6d3 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.11,name:The Eclipse Project Updates);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.11,name:The Eclipse Project Updates);\
-addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2019-03,name:2019-03);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2019-03,name:2019-03);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.12,name:The Eclipse Project Updates);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.12,name:The Eclipse Project Updates);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2019-06,name:2019-06);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2019-06,name:2019-06);\
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 = Initial 4.11 Release of the Eclipse SDK.
+properties.1.value = 4.12 Release of the Eclipse SDK.
properties.2.name = org.eclipse.equinox.p2.provider
properties.2.value = Eclipse.org
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index b4c5ee61..3582b534 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -1145,11 +1145,11 @@ fn-summarize-apitooling ()
EBuilderDir=$BUILD_DIR/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder
pushd "$BUILD_DIR"
# Make sure FREEZE_PARAMS is defined, but empty space, if not using freeze reports.
- #FREEZE_PARAMS=" "
+ 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.11RC1-201903010040/eclipse-SDK-4.11RC1-win32-x86_64.zip \
- -DfreezeName=Eclipse-SDK-4.11RC1 \
- -DfreezeFilename=eclipse-SDK-4.11RC1-win32-x86_64.zip "
+ #FREEZE_PARAMS="-DfreezeBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.12RC1-201903010040/eclipse-SDK-4.12RC1-win32-x86_64.zip \
+ # -DfreezeName=Eclipse-SDK-4.12RC1 \
+ # -DfreezeFilename=eclipse-SDK-4.12RC1-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.
@@ -1157,8 +1157,8 @@ 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.10
fn-write-property API_PREV_REF_LABEL
- API_FREEZE_REF_LABEL=4.11RC1
- #API_FREEZE_REF_LABEL=" "
+ #API_FREEZE_REF_LABEL=4.12RC1
+ API_FREEZE_REF_LABEL=" "
fn-write-property API_FREEZE_REF_LABEL
java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \
-data ${BUILD_DIR}/workspace-apitoolingsLogs \
diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource
index 65c32c7b..29ffe40c 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.11.0}
+export STREAM=${STREAM:-4.12.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 35b1af14..6bbc83d6 100755
--- a/production/createReports.sh
+++ b/production/createReports.sh
@@ -66,22 +66,22 @@ function latestSimpleRepo
if [[ ${build_type} == "I" ]]
then
- update_dir_segment="4.11-I-builds"
+ update_dir_segment="4.12-I-builds"
buildIdToCompare="4.10/R-4.10-201812060815"
echo -e "\tlatest_R_build: R-4.10-201812060815"
elif [[ ${build_type} == "Y" ]]
then
- update_dir_segment="4.11-Y-builds"
+ update_dir_segment="4.12-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.11-I-builds" "I20*")
+ latest_I_build=$(latestSimpleRepo "${repo_root}/4.12-I-builds" "I20*")
RC=$?
if [[ $RC != 0 ]]
then
exit $RC
fi
echo -e "\tlatest_I_build: $latest_I_build"
- buildIdToCompare="4.11-I-builds/${latest_I_build}"
+ buildIdToCompare="4.12-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 ccc7b6b9..75babd2f 100755
--- a/production/miscToolsAndNotes/checkComposites/checkComposites.sh
+++ b/production/miscToolsAndNotes/checkComposites/checkComposites.sh
@@ -30,9 +30,11 @@ repoAccess=${repoFileAccess}
# TODO: reduce this list soon
repoList="\
/eclipse/updates/4.11/ \
-/eclipse/updates/4.10/ \
-/eclipse/updates/4.10-I-builds/ \
-/eclipse/updates/4.10milestones/ \
+/eclipse/updates/4.12/ \
+/eclipse/updates/4.12-I-builds/ \
+/eclipse/updates/4.12milestones/ \
+/eclipse/updates/4.12-Y-builds/ \
+/eclipse/updates/4.12-P-builds/ \
/eclipse/updates/4.11-I-builds/ \
/eclipse/updates/4.11milestones/ \
/eclipse/updates/4.11-Y-builds/ \
diff --git a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh
index 6df80d6c..c6dd28e3 100755
--- a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh
+++ b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh
@@ -62,8 +62,8 @@ 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.11"
- currentStream="4.11"
+ printf "\n\t%s\t%s\n" "WARNING:" "Current stream version not specified on command line, assuming 4.12"
+ currentStream="4.12"
fi
maintenanceStream=$2
diff --git a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml
index f0fdbe98..274973f7 100644
--- a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml
+++ b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml
@@ -27,7 +27,7 @@
<fail
unless="currentStream"
- message="currentStream (such as '4.11') must be defined for this script" />
+ message="currentStream (such as '4.12') must be defined for this script" />
<fail
unless="maintenanceStream"
message="maintenanceStream (such as '4.10') must be defined for this script" />
diff --git a/production/sdk/cleaners/cleanupNightlyRepo.sh b/production/sdk/cleaners/cleanupNightlyRepo.sh
index 6a59572f..e2a87d27 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.11-I-builds"
-eclipseSRepo="${remoteBase}/eclipse/updates/4.11milestones"
-eclipseYRepo="${remoteBase}/eclipse/updates/4.11-Y-builds"
-eclipsePRepo="${remoteBase}/eclipse/updates/4.11-P-builds"
+eclipseIRepo="${remoteBase}/eclipse/updates/4.12-I-builds"
+eclipseSRepo="${remoteBase}/eclipse/updates/4.12milestones"
+eclipseYRepo="${remoteBase}/eclipse/updates/4.12-Y-builds"
+eclipsePRepo="${remoteBase}/eclipse/updates/4.12-P-builds"
#doDryrun=dryrun
doDryrun=
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index ad9cb06f..e15f79fc 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.11.0 builds and tests"
+streamSpecificPropertiesTitle="Properties for 4.12.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 b9385c92..76beb7c3 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.11.0
+eclipseStream=4.12.0
EBUILDER_HASH=master
#EBUILDER_HASH=4295494c43e464a0c4ee39b7e0c847fbc3263f2a

Back to the top