Bug 545103 - Move I-builds to R4_11_maintenance branch

Change-Id: I5e904a3c25b5067f1fa8c5dbfaa4095f843c482a
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>

16 files changed, 47 insertions, 730 deletions

diff --git a/production/sdk/bootstrap/mb411I_hudson.sh b/production/sdk/bootstrap/mb411I_hudson.sh
index ab7e3005b..9fdeaf2ba 100644
--- a/production/sdk/bootstrap/mb411I_hudson.sh
+++ b/production/sdk/bootstrap/mb411I_hudson.sh
@@ -80,7 +80,7 @@ echo "Starting $SCRIPT_NAME at $( date +%Y%m%d-%H%M ) "
 
 echo "umask explicitly set to $NEWUMASK, old value was $oldumask"
 
-export BRANCH=master
+export BRANCH=R4_11_maintenance
 export BUILD_TYPE=I
 export STREAM=4.11.0
 
diff --git a/production/sdk/bootstrap/mb410I_hudson.sh b/production/sdk/bootstrap/mb412I_hudson.sh
index 086449cd1..bdde7216b 100644
--- a/production/sdk/bootstrap/mb410I_hudson.sh
+++ b/production/sdk/bootstrap/mb412I_hudson.sh
@@ -82,7 +82,7 @@ echo "umask explicitly set to $NEWUMASK, old value was $oldumask"
 
 export BRANCH=master
 export BUILD_TYPE=I
-export STREAM=4.10.0
+export STREAM=4.12.0
 
 eclipseStreamMajor=${STREAM:0:1}
 
diff --git a/production/sdk/bootstrap/mb46P.sh b/production/sdk/bootstrap/mb46P.sh
deleted file mode 100755
index 5e3240953..000000000
--- a/production/sdk/bootstrap/mb46P.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/env bash
-
-# Simple utility to run as cronjob to run Eclipse Platform builds
-# Normally resides in $BUILD_HOME
-
-function usage()
-{
-  printf "\n\tSimple script start a build of a certain stream." >&2
-  printf "\n\tUsage: %s [[-h] | [-t]] " $(basename $0) >&2
-  printf "\n\t\t%s\n" "where h==help, t==test build " >&2
-}
-
-# Start with minimal path for consistency across machines
-# plus, cron jobs do not inherit an environment
-# care is needed not have anything in ${HOME}/bin that would effect the build
-# unintentionally, but is required to make use of "source localBuildProperties.shsource" on
-# local machines.
-# Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it
-# to false) for a test I-build on a remote machine.
-export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin
-# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves)
-unset JAVA_HOME
-unset JAVA_ROOT
-unset JAVA_JRE
-unset CLASSPATH
-unset JAVA_BINDIR
-unset JRE_HOME
-
-# 0002 is often the default for shell users, but it is not when ran from
-# a cron job, so we set it explicitly, so releng group has write access to anything
-# we create.
-NEWUMASK="0002"
-oldumask=$(umask)
-umask $NEWUMASK
-
-echo "ulimit (file handles): $( ulimit -n ) "
-ulimit -n 4096
-echo "ulimit (file handles): $( ulimit -n ) "
-
-echo "locale charmap: $(locale charmap)"
-echo "LC_ALL: $LC_ALL"
-echo "LANG: $LANG"
-echo "LANGUAGE: $LANGUAGE"
-export LC_ALL=en_US.UTF-8
-export LANG=en_US.UTF-8
-export LANGUAGE=en_US.UTF-8
-echo "LC_ALL: $LC_ALL"
-echo "LANG: $LANG"
-echo "LANGUAGE: $LANGUAGE"
-echo "locale charmap: $(locale charmap)"
-
-# all optional
-# normally, when ran from crobjob, none should be specified
-while getopts 'ht' OPTION
-do
-  case $OPTION in
-    h)    usage
-      exit
-      ;;
-    t)    export testbuildonly=true
-      ;;
-  esac
-done
-
-# this localBuildProperties.shsource file is to ease local builds to override some variables.
-# It should not be used for production builds.
-source localBuildProperties.shsource 2>/dev/null
-export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
-
-SCRIPT_NAME=$0
-LOG_BASE_NAME=${SCRIPT_NAME##*/}
-LOG_OUT_NAME=${BUILD_HOME}/${LOG_BASE_NAME%.*}.out.log
-LOG_ERR_NAME=${BUILD_HOME}/${LOG_BASE_NAME%.*}.err.log
-
-echo "Starting $SCRIPT_NAME at $( date +%Y%m%d-%H%M ) " 1>$LOG_OUT_NAME 2>$LOG_ERR_NAME
-
-echo "umask explicitly set to $NEWUMASK, old value was $oldumask" 1>>$LOG_OUT_NAME 2>>$LOG_ERR_NAME
-
-# use BETA_JAVA9 to do a "complete build" that includes Java 9 beta code
-# use master to literally build "just the three" bundles that are required.
-#export BRANCH=BETA_JAVA9
-export BRANCH=master
-export BUILD_TYPE=P
-export STREAM=4.6.3
-export PATCH_BUILD=java9patch46
-
-eclipseStreamMajor=${STREAM:0:1}
-
-# unique short name for stream and build type
-BUILDSTREAMTYPEDIR=${eclipseStreamMajor}$BUILD_TYPE
-
-export BUILD_ROOT=${BUILD_HOME}/${BUILDSTREAMTYPEDIR}
-
-# These values for proxies come from the configuration files of the Releng HIPP instance. 
-# They are normally defined in "ANT_OPTS" and similar environment variables, but 
-# the JavaDoc program requires them is this special -Jflag form. 
-# If running locally, all these proxy value should be overridden and set to empty string.
-export JAVA_DOC_PROXIES=${JAVA_DOC_PROXIES:-"-J-Dhttps.proxyHost=proxy.eclipse.org -J-Dhttps.proxyPort=9898 -J-Dhttps.nonProxyHosts=\"172.30.206.*\""}
-
-# These definitions are primarily for Curl. (Wget and other programs use different env variables or parameters
-export NO_PROXY=${NO_PROXY:-eclipse.org,build.eclipse.org,download.eclipse.org,archive.eclipse.org,dev.eclipes.org,git.eclipse.org}
-export ALL_PROXY=${ALL_PROXY:-proxy.eclipse.org:9898}
-
-export PRODUCTION_SCRIPTS_DIR=production
-
-source $BUILD_HOME/bootstrap.shsource
-
-# default (later) is set to 'true'. 
-# set to false here for less output.
-# export MVN_DEBUG=false
-
-# run rest in "back ground"
-${BUILD_ROOT}/${PRODUCTION_SCRIPTS_DIR}/master-build.sh "${BUILD_ROOT}/${PRODUCTION_SCRIPTS_DIR}/build_eclipse_org.shsource" 1>>$LOG_OUT_NAME 2>>$LOG_ERR_NAME &
diff --git a/production/sdk/bootstrap/mb46P_hudson.sh b/production/sdk/bootstrap/mb46P_hudson.sh
deleted file mode 100755
index 77d595535..000000000
--- a/production/sdk/bootstrap/mb46P_hudson.sh
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/usr/bin/env bash
-
-# This job is just like its cronjob counter part, except it 
-# turns off verbose debugging (else Hudson logs would be 300 MB)
-# and does not pipe output to separate files, but lets it all go 
-# to Hudson't "console". 
-# Normally resides in $BUILD_HOME
-
-function usage()
-{
-  printf "\n\tSimple script start a build of a certain stream." >&2
-  printf "\n\tUsage: %s [[-h] | [-t]] " $(basename $0) >&2
-  printf "\n\t\t%s\n" "where h==help, t==test build " >&2
-}
-
-# Start with minimal path for consistency across machines
-# plus, cron jobs do not inherit an environment
-# care is needed not have anything in ${HOME}/bin that would effect the build
-# unintentionally, but is required to make use of "source localBuildProperties.shsource" on
-# local machines.
-# Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it
-# to false) for a test I-build on a remote machine.
-export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin
-# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves)
-unset JAVA_HOME
-unset JAVA_ROOT
-unset JAVA_JRE
-unset CLASSPATH
-unset JAVA_BINDIR
-unset JRE_HOME
-
-# 0002 is often the default for shell users, but it is not when ran from
-# a cron job, so we set it explicitly, so releng group has write access to anything
-# we create.
-NEWUMASK="0002"
-oldumask=$(umask)
-umask $NEWUMASK
-
-echo "ulimit (file handles): $( ulimit -n ) "
-ulimit -n 4096
-echo "ulimit (file handles): $( ulimit -n ) "
-
-echo "locale charmap: $(locale charmap)"
-echo "LC_ALL: $LC_ALL"
-echo "LANG: $LANG"
-echo "LANGUAGE: $LANGUAGE"
-export LC_ALL=en_US.UTF-8
-export LANG=en_US.UTF-8
-export LANGUAGE=en_US.UTF-8
-echo "LC_ALL: $LC_ALL"
-echo "LANG: $LANG"
-echo "LANGUAGE: $LANGUAGE"
-echo "locale charmap: $(locale charmap)"
-
-# all optional
-# normally, when ran from crobjob, none should be specified
-while getopts 'ht' OPTION
-do
-  case $OPTION in
-    h)    usage
-      exit
-      ;;
-    t)    export testbuildonly=true
-      ;;
-  esac
-done
-
-# this localBuildProperties.shsource file is to ease local builds to override some variables.
-# It should not be used for production builds.
-source localBuildProperties.shsource 2>/dev/null
-
-# BUILD_HOME defines the "top" of the build area (for all types of builds)
-export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
-
-SCRIPT_NAME=$0
-
-echo "Starting $SCRIPT_NAME at $( date +%Y%m%d-%H%M ) "
-
-echo "umask explicitly set to $NEWUMASK, old value was $oldumask"
-
-# use BETA_JAVA9 to do a "complete build" that includes Java 9 beta code
-# use master to literally build "just the three" bundles that are required.
-#export BRANCH=BETA_JAVA9
-export BRANCH=master
-export BUILD_TYPE=P
-export STREAM=4.6.3
-export PATCH_BUILD=java9patch46
-
-eclipseStreamMajor=${STREAM:0:1}
-
-# unique short name for stream and build type
-BUILDSTREAMTYPEDIR=${eclipseStreamMajor}$BUILD_TYPE
-
-export BUILD_ROOT=${BUILD_HOME}/${BUILDSTREAMTYPEDIR}
-
-# These values for proxies come from the configuration files of the Releng HIPP instance. 
-# They are normally defined in "ANT_OPTS" and similar environment variables, but 
-# the JavaDoc program requires them is this special -Jflag form. 
-export JAVA_DOC_PROXIES=${JAVA_DOC_PROXIES:-"-J-Dhttps.proxyHost=proxy.eclipse.org -J-Dhttps.proxyPort=9898 -J-Dhttps.nonProxyHosts=\"172.30.206.*\""}
-
-# These definitions are primarily for Curl. (Wget and other programs use different env variables or parameters
-export NO_PROXY=${NO_PROXY:-eclipse.org,build.eclipse.org,download.eclipse.org,archive.eclipse.org,dev.eclipes.org,git.eclipse.org}
-export ALL_PROXY=${ALL_PROXY:-proxy.eclipse.org:9898}
-
-# default (later) is set to 'true'. 
-# set to false here for less output.
-# setting to false until  bug 495750 is fixed, else too much output.
-# export MVN_DEBUG=false
-
-
-export PRODUCTION_SCRIPTS_DIR=production
-if [[ -z "${WORKSPACE}" ]]
-then
-   export RUNNING_ON_HUDSON=false
-else
-   export RUNNING_ON_HUDSON=true
-fi
-echo -e "\n\t[INFO]RUNNING_ON_HUDSON: $RUNNING_ON_HUDSON"
-
-# To allow this cron job to work from hudson, or traditional crontab
-if [[ -z "${WORKSPACE}" ]]
-then
-  export UTILITIES_HOME=/shared/eclipse
-  source $BUILD_HOME/bootstrap.shsource
-  makeProductionDirectoryOnBuildMachine
-  # build_eclipse_org.shsource should come from branch 
-  # though ideally  the rest of "production" directory would be identical between branches.
-${BUILD_ROOT}/${PRODUCTION_SCRIPTS_DIR}/master-build.sh "${BUILD_ROOT}/${PRODUCTION_SCRIPTS_DIR}/build_eclipse_org.shsource" 
-else
-  export UTILITIES_HOME=${WORKSPACE}/utilities/production
-  source $UTILITIES_HOME/sdk/bootstrap/bootstrap.shsource
-  $UTILITIES_HOME/master-build.sh $UTILITIES_HOME/build_eclipse_org.shsource
-fi
-
diff --git a/production/sdk/bootstrap/mb47P.sh b/production/sdk/bootstrap/mb47P.sh
deleted file mode 100755
index 9d93ce91a..000000000
--- a/production/sdk/bootstrap/mb47P.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/env bash
-
-# Simple utility to run as cronjob to run Eclipse Platform builds
-# Normally resides in $BUILD_HOME
-
-function usage()
-{
-  printf "\n\tSimple script start a build of a certain stream." >&2
-  printf "\n\tUsage: %s [[-h] | [-t]] " $(basename $0) >&2
-  printf "\n\t\t%s\n" "where h==help, t==test build " >&2
-}
-
-# Start with minimal path for consistency across machines
-# plus, cron jobs do not inherit an environment
-# care is needed not have anything in ${HOME}/bin that would effect the build
-# unintentionally, but is required to make use of "source localBuildProperties.shsource" on
-# local machines.
-# Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it
-# to false) for a test I-build on a remote machine.
-export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin
-# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves)
-unset JAVA_HOME
-unset JAVA_ROOT
-unset JAVA_JRE
-unset CLASSPATH
-unset JAVA_BINDIR
-unset JRE_HOME
-
-# 0002 is often the default for shell users, but it is not when ran from
-# a cron job, so we set it explicitly, so releng group has write access to anything
-# we create.
-NEWUMASK="0002"
-oldumask=$(umask)
-umask $NEWUMASK
-
-echo "ulimit (file handles): $( ulimit -n ) "
-ulimit -n 4096
-echo "ulimit (file handles): $( ulimit -n ) "
-
-echo "locale charmap: $(locale charmap)"
-echo "LC_ALL: $LC_ALL"
-echo "LANG: $LANG"
-echo "LANGUAGE: $LANGUAGE"
-export LC_ALL=en_US.UTF-8
-export LANG=en_US.UTF-8
-export LANGUAGE=en_US.UTF-8
-echo "LC_ALL: $LC_ALL"
-echo "LANG: $LANG"
-echo "LANGUAGE: $LANGUAGE"
-echo "locale charmap: $(locale charmap)"
-
-# all optional
-# normally, when ran from crobjob, none should be specified
-while getopts 'ht' OPTION
-do
-  case $OPTION in
-    h)    usage
-      exit
-      ;;
-    t)    export testbuildonly=true
-      ;;
-  esac
-done
-
-# this localBuildProperties.shsource file is to ease local builds to override some variables.
-# It should not be used for production builds.
-source localBuildProperties.shsource 2>/dev/null
-export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
-
-SCRIPT_NAME=$0
-LOG_BASE_NAME=${SCRIPT_NAME##*/}
-LOG_OUT_NAME=${BUILD_HOME}/${LOG_BASE_NAME%.*}.out.log
-LOG_ERR_NAME=${BUILD_HOME}/${LOG_BASE_NAME%.*}.err.log
-
-echo "Starting $SCRIPT_NAME at $( date +%Y%m%d-%H%M ) " 1>$LOG_OUT_NAME 2>$LOG_ERR_NAME
-
-echo "umask explicitly set to $NEWUMASK, old value was $oldumask" 1>>$LOG_OUT_NAME 2>>$LOG_ERR_NAME
-
-# use BETA_JAVA9 to do a "complete build" that includes Java 9 beta code
-# use master to literally build "just the three" bundles that are required.
-#export BRANCH=BETA_JAVA9
-export BRANCH=master
-export BUILD_TYPE=P
-export STREAM=4.7.0
-export PATCH_BUILD=java9patch47
-
-eclipseStreamMajor=${STREAM:0:1}
-
-# unique short name for stream and build type
-BUILDSTREAMTYPEDIR=${eclipseStreamMajor}$BUILD_TYPE
-
-export BUILD_ROOT=${BUILD_HOME}/${BUILDSTREAMTYPEDIR}
-
-# These values for proxies come from the configuration files of the Releng HIPP instance. 
-# They are normally defined in "ANT_OPTS" and similar environment variables, but 
-# the JavaDoc program requires them is this special -Jflag form. 
-# If running locally, all these proxy value should be overridden and set to empty string.
-export JAVA_DOC_PROXIES=${JAVA_DOC_PROXIES:-"-J-Dhttps.proxyHost=proxy.eclipse.org -J-Dhttps.proxyPort=9898 -J-Dhttps.nonProxyHosts=\"172.30.206.*\""}
-
-# These definitions are primarily for Curl. (Wget and other programs use different env variables or parameters
-export NO_PROXY=${NO_PROXY:-eclipse.org,build.eclipse.org,download.eclipse.org,archive.eclipse.org,dev.eclipes.org,git.eclipse.org}
-export ALL_PROXY=${ALL_PROXY:-proxy.eclipse.org:9898}
-
-export PRODUCTION_SCRIPTS_DIR=production
-
-source $BUILD_HOME/bootstrap.shsource
-
-# default (later) is set to 'true'. 
-# set to false here for less output.
-# export MVN_DEBUG=false
-
-# run rest in "back ground"
-${BUILD_ROOT}/${PRODUCTION_SCRIPTS_DIR}/master-build.sh "${BUILD_ROOT}/${PRODUCTION_SCRIPTS_DIR}/build_eclipse_org.shsource" 1>>$LOG_OUT_NAME 2>>$LOG_ERR_NAME &
diff --git a/production/sdk/bootstrap/mb47P_hudson.sh b/production/sdk/bootstrap/mb47P_hudson.sh
deleted file mode 100755
index 523a4319c..000000000
--- a/production/sdk/bootstrap/mb47P_hudson.sh
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/usr/bin/env bash
-
-# This job is just like its cronjob counter part, except it 
-# turns off verbose debugging (else Hudson logs would be 300 MB)
-# and does not pipe output to separate files, but lets it all go 
-# to Hudson't "console". 
-# Normally resides in $BUILD_HOME
-
-function usage()
-{
-  printf "\n\tSimple script start a build of a certain stream." >&2
-  printf "\n\tUsage: %s [[-h] | [-t]] " $(basename $0) >&2
-  printf "\n\t\t%s\n" "where h==help, t==test build " >&2
-}
-
-# Start with minimal path for consistency across machines
-# plus, cron jobs do not inherit an environment
-# care is needed not have anything in ${HOME}/bin that would effect the build
-# unintentionally, but is required to make use of "source localBuildProperties.shsource" on
-# local machines.
-# Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it
-# to false) for a test I-build on a remote machine.
-export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin
-# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves)
-unset JAVA_HOME
-unset JAVA_ROOT
-unset JAVA_JRE
-unset CLASSPATH
-unset JAVA_BINDIR
-unset JRE_HOME
-
-# 0002 is often the default for shell users, but it is not when ran from
-# a cron job, so we set it explicitly, so releng group has write access to anything
-# we create.
-NEWUMASK="0002"
-oldumask=$(umask)
-umask $NEWUMASK
-
-echo "ulimit (file handles): $( ulimit -n ) "
-ulimit -n 4096
-echo "ulimit (file handles): $( ulimit -n ) "
-
-echo "locale charmap: $(locale charmap)"
-echo "LC_ALL: $LC_ALL"
-echo "LANG: $LANG"
-echo "LANGUAGE: $LANGUAGE"
-export LC_ALL=en_US.UTF-8
-export LANG=en_US.UTF-8
-export LANGUAGE=en_US.UTF-8
-echo "LC_ALL: $LC_ALL"
-echo "LANG: $LANG"
-echo "LANGUAGE: $LANGUAGE"
-echo "locale charmap: $(locale charmap)"
-
-# all optional
-# normally, when ran from crobjob, none should be specified
-while getopts 'ht' OPTION
-do
-  case $OPTION in
-    h)    usage
-      exit
-      ;;
-    t)    export testbuildonly=true
-      ;;
-  esac
-done
-
-# this localBuildProperties.shsource file is to ease local builds to override some variables.
-# It should not be used for production builds.
-source localBuildProperties.shsource 2>/dev/null
-
-# BUILD_HOME defines the "top" of the build area (for all types of builds)
-export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
-
-SCRIPT_NAME=$0
-
-echo "Starting $SCRIPT_NAME at $( date +%Y%m%d-%H%M ) "
-
-echo "umask explicitly set to $NEWUMASK, old value was $oldumask"
-
-# use BETA_JAVA_18_3 to do a "complete build" that includes Java 10 beta code
-# use master to literally build "just the three" bundles that are required.
-#export BRANCH=BETA_JAVA_18_3
-export BRANCH=R4_7_maintenance
-export BUILD_TYPE=P
-export STREAM=4.7.3
-export PATCH_BUILD=java10patch47
-
-eclipseStreamMajor=${STREAM:0:1}
-
-# unique short name for stream and build type
-BUILDSTREAMTYPEDIR=${eclipseStreamMajor}$BUILD_TYPE
-
-export BUILD_ROOT=${BUILD_HOME}/${BUILDSTREAMTYPEDIR}
-
-# These values for proxies come from the configuration files of the Releng HIPP instance. 
-# They are normally defined in "ANT_OPTS" and similar environment variables, but 
-# the JavaDoc program requires them is this special -Jflag form. 
-export JAVA_DOC_PROXIES=${JAVA_DOC_PROXIES:-"-J-Dhttps.proxyHost=proxy.eclipse.org -J-Dhttps.proxyPort=9898 -J-Dhttps.nonProxyHosts=\"172.30.206.*\""}
-
-# These definitions are primarily for Curl. (Wget and other programs use different env variables or parameters
-export NO_PROXY=${NO_PROXY:-eclipse.org,build.eclipse.org,download.eclipse.org,archive.eclipse.org,dev.eclipes.org,git.eclipse.org}
-export ALL_PROXY=${ALL_PROXY:-proxy.eclipse.org:9898}
-
-# default (later) is set to 'true'. 
-# set to false here for less output.
-# setting to false until  bug 495750 is fixed, else too much output.
-# export MVN_DEBUG=false
-
-
-export PRODUCTION_SCRIPTS_DIR=production
-if [[ -z "${WORKSPACE}" ]]
-then
-   export RUNNING_ON_HUDSON=false
-else
-   export RUNNING_ON_HUDSON=true
-fi
-echo -e "\n\t[INFO]RUNNING_ON_HUDSON: $RUNNING_ON_HUDSON"
-
-# To allow this cron job to work from hudson, or traditional crontab
-if [[ -z "${WORKSPACE}" ]]
-then
-  export UTILITIES_HOME=/shared/eclipse
-  source $BUILD_HOME/bootstrap.shsource
-  makeProductionDirectoryOnBuildMachine
-  # build_eclipse_org.shsource should come from branch 
-  # though ideally  the rest of "production" directory would be identical between branches.
-${BUILD_ROOT}/${PRODUCTION_SCRIPTS_DIR}/master-build.sh "${BUILD_ROOT}/${PRODUCTION_SCRIPTS_DIR}/build_eclipse_org.shsource" 
-else
-  export UTILITIES_HOME=${WORKSPACE}/utilities/production
-  source $UTILITIES_HOME/sdk/bootstrap/bootstrap.shsource
-  $UTILITIES_HOME/master-build.sh $UTILITIES_HOME/build_eclipse_org.shsource
-fi
-
diff --git a/production/sdk/bootstrap/mb47U_hudson.sh b/production/sdk/bootstrap/mb47U_hudson.sh
deleted file mode 100755
index ccd214156..000000000
--- a/production/sdk/bootstrap/mb47U_hudson.sh
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/usr/bin/env bash
-
-# This job is just like its cronjob counter part, except it 
-# turns off verbose debugging (else Hudson logs would be 300 MB)
-# and does not pipe output to separate files, but lets it all go 
-# to Hudson't "console". 
-# Normally resides in $BUILD_HOME
-
-function usage()
-{
-  printf "\n\tSimple script start a build of a certain stream." >&2
-  printf "\n\tUsage: %s [[-h] | [-t]] " $(basename $0) >&2
-  printf "\n\t\t%s\n" "where h==help, t==test build " >&2
-}
-
-# Start with minimal path for consistency across machines
-# plus, cron jobs do not inherit an environment
-# care is needed not have anything in ${HOME}/bin that would effect the build
-# unintentionally, but is required to make use of "source localBuildProperties.shsource" on
-# local machines.
-# Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it
-# to false) for a test I-build on a remote machine.
-export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin
-# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves)
-unset JAVA_HOME
-unset JAVA_ROOT
-unset JAVA_JRE
-unset CLASSPATH
-unset JAVA_BINDIR
-unset JRE_HOME
-
-# 0002 is often the default for shell users, but it is not when ran from
-# a cron job, so we set it explicitly, so releng group has write access to anything
-# we create.
-NEWUMASK="0002"
-oldumask=$(umask)
-umask $NEWUMASK
-
-echo "ulimit (file handles): $( ulimit -n ) "
-ulimit -n 4096
-echo "ulimit (file handles): $( ulimit -n ) "
-
-echo "locale charmap: $(locale charmap)"
-echo "LC_ALL: $LC_ALL"
-echo "LANG: $LANG"
-echo "LANGUAGE: $LANGUAGE"
-export LC_ALL=en_US.UTF-8
-export LANG=en_US.UTF-8
-export LANGUAGE=en_US.UTF-8
-echo "LC_ALL: $LC_ALL"
-echo "LANG: $LANG"
-echo "LANGUAGE: $LANGUAGE"
-echo "locale charmap: $(locale charmap)"
-
-# all optional
-# normally, when ran from crobjob, none should be specified
-while getopts 'ht' OPTION
-do
-  case $OPTION in
-    h)    usage
-      exit
-      ;;
-    t)    export testbuildonly=true
-      ;;
-  esac
-done
-
-# this localBuildProperties.shsource file is to ease local builds to override some variables.
-# It should not be used for production builds.
-source localBuildProperties.shsource 2>/dev/null
-
-# BUILD_HOME defines the "top" of the build area (for all types of builds)
-export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
-
-SCRIPT_NAME=$0
-
-echo "Starting $SCRIPT_NAME at $( date +%Y%m%d-%H%M ) "
-
-echo "umask explicitly set to $NEWUMASK, old value was $oldumask"
-
-# use BETA_JAVA9 to do a "complete build" that includes Java 9 beta code
-# use master to literally build "just the three" bundles that are required.
-#export BRANCH=BETA_JAVA9
-export BRANCH=R4_7_maintenance
-export BUILD_TYPE=U
-export STREAM=4.7.1
-export PATCH_OR_BRANCH_LABEL=betajunit5
-
-eclipseStreamMajor=${STREAM:0:1}
-
-# unique short name for stream and build type
-BUILDSTREAMTYPEDIR=${eclipseStreamMajor}$BUILD_TYPE
-
-export BUILD_ROOT=${BUILD_HOME}/${BUILDSTREAMTYPEDIR}
-
-# These values for proxies come from the configuration files of the Releng HIPP instance. 
-# They are normally defined in "ANT_OPTS" and similar environment variables, but 
-# the JavaDoc program requires them is this special -Jflag form. 
-export JAVA_DOC_PROXIES=${JAVA_DOC_PROXIES:-"-J-Dhttps.proxyHost=proxy.eclipse.org -J-Dhttps.proxyPort=9898 -J-Dhttps.nonProxyHosts=\"172.30.206.*\""}
-
-# These definitions are primarily for Curl. (Wget and other programs use different env variables or parameters
-export NO_PROXY=${NO_PROXY:-eclipse.org,build.eclipse.org,download.eclipse.org,archive.eclipse.org,dev.eclipes.org,git.eclipse.org}
-export ALL_PROXY=${ALL_PROXY:-proxy.eclipse.org:9898}
-
-# default (later) is set to 'true'. 
-# set to false here for less output.
-# setting to false until  bug 495750 is fixed, else too much output.
-# export MVN_DEBUG=false
-
-
-export PRODUCTION_SCRIPTS_DIR=production
-if [[ -z "${WORKSPACE}" ]]
-then
-   export RUNNING_ON_HUDSON=false
-else
-   export RUNNING_ON_HUDSON=true
-fi
-echo -e "\n\t[INFO]RUNNING_ON_HUDSON: $RUNNING_ON_HUDSON"
-
-# To allow this cron job to work from hudson, or traditional crontab
-if [[ -z "${WORKSPACE}" ]]
-then
-  export UTILITIES_HOME=/shared/eclipse
-  source $BUILD_HOME/bootstrap.shsource
-  makeProductionDirectoryOnBuildMachine
-  # build_eclipse_org.shsource should come from branch 
-  # though ideally  the rest of "production" directory would be identical between branches.
-${BUILD_ROOT}/${PRODUCTION_SCRIPTS_DIR}/master-build.sh "${BUILD_ROOT}/${PRODUCTION_SCRIPTS_DIR}/build_eclipse_org.shsource" 
-else
-  export UTILITIES_HOME=${WORKSPACE}/utilities/production
-  source $UTILITIES_HOME/sdk/bootstrap/bootstrap.shsource
-  $UTILITIES_HOME/master-build.sh $UTILITIES_HOME/build_eclipse_org.shsource
-fi
-
diff --git a/production/sdk/bootstrap/mb4P_hudson.sh b/production/sdk/bootstrap/mb4P_hudson.sh
index e9f4be162..541be9721 100755
--- a/production/sdk/bootstrap/mb4P_hudson.sh
+++ b/production/sdk/bootstrap/mb4P_hudson.sh
@@ -81,7 +81,7 @@ echo "umask explicitly set to $NEWUMASK, old value was $oldumask"
 # use BETA_JAVA_12 to do a "complete build" that includes Java 12 beta code
 # use master to literally build "just the four" bundles that are required.
 #export BRANCH=BETA_JAVA12
-export BRANCH=master
+export BRANCH=R4_11_maintenance
 export BUILD_TYPE=P
 export STREAM=4.11.0
 export PATCH_BUILD=java12patch411
diff --git a/production/sdk/bootstrap/mb4Y_hudson.sh b/production/sdk/bootstrap/mb4Y_hudson.sh
index c341c0acd..1a16d3e2b 100755
--- a/production/sdk/bootstrap/mb4Y_hudson.sh
+++ b/production/sdk/bootstrap/mb4Y_hudson.sh
@@ -83,7 +83,7 @@ echo "umask explicitly set to $NEWUMASK, old value was $oldumask"
 #export CBI_JDT_REPO_URL="http://build.eclipse.org/eclipse/jdtx/"
 #export CBI_JDT_VERSION="3.9.2.v20140309-1413"
 
-export BRANCH=master
+export BRANCH=R4_11_maintenance
 export BUILD_TYPE=Y
 export STREAM=4.11.0
 export PATCH_OR_BRANCH_LABEL=java12
diff --git a/production/streams/repositories_R4_11_maintenance.txt b/production/streams/repositories_R4_11_maintenance.txt
new file mode 100644
index 000000000..36f3330a8
--- /dev/null
+++ b/production/streams/repositories_R4_11_maintenance.txt
@@ -0,0 +1,24 @@
+rt.equinox.binaries: R4_11_maintenance
+rt.equinox.bundles: R4_11_maintenance
+rt.equinox.framework: R4_11_maintenance
+rt.equinox.p2: R4_11_maintenance
+eclipse.jdt.core.binaries: R4_11_maintenance
+eclipse.jdt.core: R4_11_maintenance
+eclipse.jdt.debug: R4_11_maintenance
+eclipse.jdt: R4_11_maintenance
+eclipse.jdt.ui: R4_11_maintenance
+eclipse.pde.build: R4_11_maintenance
+eclipse.pde.ui: R4_11_maintenance
+eclipse.platform.debug: R4_11_maintenance
+eclipse.platform.resources: R4_11_maintenance
+eclipse.platform: R4_11_maintenance
+eclipse.platform.common: R4_11_maintenance
+eclipse.platform.releng: R4_11_maintenance
+eclipse.platform.runtime: R4_11_maintenance
+eclipse.platform.swt: R4_11_maintenance
+eclipse.platform.swt.binaries: R4_11_maintenance
+eclipse.platform.team: R4_11_maintenance
+eclipse.platform.text: R4_11_maintenance
+eclipse.platform.ua: R4_11_maintenance
+eclipse.platform.ui: R4_11_maintenance
+eclipse.platform.ui.tools: R4_11_maintenance
diff --git a/production/streams/repositories_R4_9_maintenance.txt b/production/streams/repositories_R4_9_maintenance.txt
deleted file mode 100644
index a6cb18ef1..000000000
--- a/production/streams/repositories_R4_9_maintenance.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-rt.equinox.binaries: R4_9_maintenance
-rt.equinox.bundles: R4_9_maintenance
-rt.equinox.framework: R4_9_maintenance
-rt.equinox.p2: R4_9_maintenance
-eclipse.jdt.core.binaries: R4_9_maintenance
-eclipse.jdt.core: R4_9_maintenance
-eclipse.jdt.debug: R4_9_maintenance
-eclipse.jdt: R4_9_maintenance
-eclipse.jdt.ui: R4_9_maintenance
-eclipse.pde.build: R4_9_maintenance
-eclipse.pde.ui: R4_9_maintenance
-eclipse.platform.debug: R4_9_maintenance
-eclipse.platform.resources: R4_9_maintenance
-eclipse.platform: R4_9_maintenance
-eclipse.platform.common: R4_9_maintenance
-eclipse.platform.releng: R4_9_maintenance
-eclipse.platform.runtime: R4_9_maintenance
-eclipse.platform.swt: R4_9_maintenance
-eclipse.platform.swt.binaries: R4_9_maintenance
-eclipse.platform.team: R4_9_maintenance
-eclipse.platform.text: R4_9_maintenance
-eclipse.platform.ua: R4_9_maintenance
-eclipse.platform.ui: R4_9_maintenance
-eclipse.platform.ui.tools: R4_9_maintenance
diff --git a/production/streams/repositories_java10.txt b/production/streams/repositories_java10.txt
deleted file mode 100644
index f81b36317..000000000
--- a/production/streams/repositories_java10.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-rt.equinox.binaries: R4_7_maintenance
-rt.equinox.bundles: R4_7_maintenance
-rt.equinox.framework: R4_7_maintenance
-rt.equinox.p2: R4_7_maintenance
-eclipse.jdt.core.binaries: R4_7_maintenance
-eclipse.jdt.core: BETA_JAVA_18_3
-eclipse.jdt.debug: BETA_JAVA_18_3
-eclipse.jdt: R4_7_maintenance
-eclipse.jdt.ui: BETA_JAVA_18_3
-eclipse.pde.build: R4_7_maintenance
-eclipse.pde.ui: R4_7_maintenance
-eclipse.platform.debug: R4_7_maintenance
-eclipse.platform.resources: R4_7_maintenance
-eclipse.platform: R4_7_maintenance
-eclipse.platform.common: R4_7_maintenance
-eclipse.platform.releng: R4_7_maintenance
-eclipse.platform.runtime: R4_7_maintenance
-eclipse.platform.swt: R4_7_maintenance
-eclipse.platform.swt.binaries: R4_7_maintenance
-eclipse.platform.team: R4_7_maintenance
-eclipse.platform.text: R4_7_maintenance
-eclipse.platform.ua: R4_7_maintenance
-eclipse.platform.ui: R4_7_maintenance
-eclipse.platform.ui.tools: R4_7_maintenance
diff --git a/production/streams/repositories_java10patch47.txt b/production/streams/repositories_java10patch47.txt
deleted file mode 100644
index 0f98b3519..000000000
--- a/production/streams/repositories_java10patch47.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.jdt.core: BETA_JAVA_18_3
-eclipse.jdt.debug: BETA_JAVA_18_3
-eclipse.jdt.ui: BETA_JAVA_18_3
\ No newline at end of file
diff --git a/production/streams/repositories_java11.txt b/production/streams/repositories_java11.txt
deleted file mode 100644
index 9b94ba976..000000000
--- a/production/streams/repositories_java11.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-rt.equinox.binaries: R4_9_maintenance
-rt.equinox.bundles: R4_9_maintenance
-rt.equinox.framework: R4_9_maintenance
-rt.equinox.p2: R4_9_maintenance
-eclipse.jdt.core.binaries: R4_9_maintenance
-eclipse.jdt.core: BETA_JAVA11
-eclipse.jdt.debug: BETA_JAVA11
-eclipse.jdt: R4_9_maintenance
-eclipse.jdt.ui: BETA_JAVA11
-eclipse.pde.build: R4_9_maintenance
-eclipse.pde.ui: BETA_JAVA11
-eclipse.platform.debug: R4_9_maintenance
-eclipse.platform.resources: R4_9_maintenance
-eclipse.platform: R4_9_maintenance
-eclipse.platform.common: R4_9_maintenance
-eclipse.platform.releng: R4_9_maintenance
-eclipse.platform.runtime: R4_9_maintenance
-eclipse.platform.swt: R4_9_maintenance
-eclipse.platform.swt.binaries: R4_9_maintenance
-eclipse.platform.team: R4_9_maintenance
-eclipse.platform.text: R4_9_maintenance
-eclipse.platform.ua: R4_9_maintenance
-eclipse.platform.ui: R4_9_maintenance
-eclipse.platform.ui.tools: R4_9_maintenance
diff --git a/production/streams/repositories_java11patch49.txt b/production/streams/repositories_java11patch49.txt
deleted file mode 100644
index 5a2b60bfe..000000000
--- a/production/streams/repositories_java11patch49.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.jdt.core: BETA_JAVA11
-eclipse.jdt.debug: BETA_JAVA11
-eclipse.jdt.ui: BETA_JAVA11
-eclipse.pde.ui: BETA_JAVA11
\ No newline at end of file
diff --git a/production/streams/repositories_java12.txt b/production/streams/repositories_java12.txt
index 219e01dab..14e8afaa5 100644
--- a/production/streams/repositories_java12.txt
+++ b/production/streams/repositories_java12.txt
@@ -1,24 +1,24 @@
-rt.equinox.binaries: master
-rt.equinox.bundles: master
-rt.equinox.framework: master
-rt.equinox.p2: master
-eclipse.jdt.core.binaries: master
+rt.equinox.binaries: R4_11_maintenance
+rt.equinox.bundles: R4_11_maintenance
+rt.equinox.framework: R4_11_maintenance
+rt.equinox.p2: R4_11_maintenance
+eclipse.jdt.core.binaries: R4_11_maintenance
 eclipse.jdt.core: BETA_JAVA_12
 eclipse.jdt.debug: BETA_JAVA_12
-eclipse.jdt: master
+eclipse.jdt: R4_11_maintenance
 eclipse.jdt.ui: BETA_JAVA_12
 eclipse.pde.build: BETA_JAVA_12
 eclipse.pde.ui: BETA_JAVA_12
-eclipse.platform.debug: master
-eclipse.platform.resources: master
-eclipse.platform: master
-eclipse.platform.common: master
-eclipse.platform.releng: master
-eclipse.platform.runtime: master
-eclipse.platform.swt: master
-eclipse.platform.swt.binaries: master
-eclipse.platform.team: master
-eclipse.platform.text: master
-eclipse.platform.ua: master
-eclipse.platform.ui: master
-eclipse.platform.ui.tools: master
+eclipse.platform.debug: R4_11_maintenance
+eclipse.platform.resources: R4_11_maintenance
+eclipse.platform: R4_11_maintenance
+eclipse.platform.common: R4_11_maintenance
+eclipse.platform.releng: R4_11_maintenance
+eclipse.platform.runtime: R4_11_maintenance
+eclipse.platform.swt: R4_11_maintenance
+eclipse.platform.swt.binaries: R4_11_maintenance
+eclipse.platform.team: R4_11_maintenance
+eclipse.platform.text: R4_11_maintenance
+eclipse.platform.ua: R4_11_maintenance
+eclipse.platform.ui: R4_11_maintenance
+eclipse.platform.ui.tools: R4_11_maintenance