Bug 548172 - Integrate new build scripts developed in bug 541301

-migrated to 4.13
-removed debugging statements
-updated maven build script to use different options on jenkins and
local

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

14 files changed, 28 insertions, 21 deletions

diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt
index 5fae0fe5e..cc7f96792 100644
--- a/cje-production/buildproperties.txt
+++ b/cje-production/buildproperties.txt
@@ -21,10 +21,10 @@ PATCH_OR_BRANCH_LABEL="master"
 BUILD_TYPE_NAME="Integration"
 BUILD_TYPE="I"
 TESTED_BUILD_TYPE="I"
-RELEASE_VER="4.12"
-STREAM="4.12.0"
+RELEASE_VER="4.13"
+STREAM="4.13.0"
 STREAMMajor="4"
-STREAMMinor="12"
+STREAMMinor="13"
 STREAMService="0"
 GIT_ROOT="git://git.eclipse.org/gitroot"
 AGG_REPO="/platform/eclipse.platform.releng.aggregator.git"
@@ -38,12 +38,12 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
 LOCAL_REPO="localMavenRepo"
 
 # Base builder parameters
-BASEBUILDER_TAG="4.11"
-API_PREV_REF_LABEL="4.11"
-PREVIOUS_RELEASE_VER="4.11"
+BASEBUILDER_TAG="4.12"
+API_PREV_REF_LABEL="4.12"
+PREVIOUS_RELEASE_VER="4.12"
 PREVIOUS_RELEASE_ID="R-4.11-201903070500"
 BUILDTOOLS_REPO="http://build.eclipse.org/eclipse/buildtools/"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-20181130055351/repositoryunittests/"
 WEBTOOLS_VER="1.2.0.v201405010053"
 BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder"
-ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.12-I-builds/"
+ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.13-I-builds/"
diff --git a/cje-production/master-build.sh b/cje-production/master-build.sh
index a0b64e3eb..b30220db3 100755
--- a/cje-production/master-build.sh
+++ b/cje-production/master-build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 #*******************************************************************************
 # Copyright (c) 2019 IBM Corporation and others.
 #
diff --git a/cje-production/mbscripts/mb010_createEnvfiles.sh b/cje-production/mbscripts/mb010_createEnvfiles.sh
index c990c2490..6f16eb62e 100755
--- a/cje-production/mbscripts/mb010_createEnvfiles.sh
+++ b/cje-production/mbscripts/mb010_createEnvfiles.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 #*******************************************************************************
 # Copyright (c) 2019 IBM Corporation and others.
diff --git a/cje-production/mbscripts/mb020_createBaseBuilder.sh b/cje-production/mbscripts/mb020_createBaseBuilder.sh
index 096e5b9d3..06618707c 100755
--- a/cje-production/mbscripts/mb020_createBaseBuilder.sh
+++ b/cje-production/mbscripts/mb020_createBaseBuilder.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 #*******************************************************************************
 # Copyright (c) 2019 IBM Corporation and others.
diff --git a/cje-production/mbscripts/mb030_downloadBuildToCompare.sh b/cje-production/mbscripts/mb030_downloadBuildToCompare.sh
index b2a9e4b6d..1c65917d5 100755
--- a/cje-production/mbscripts/mb030_downloadBuildToCompare.sh
+++ b/cje-production/mbscripts/mb030_downloadBuildToCompare.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 #*******************************************************************************
 # Copyright (c) 2019 IBM Corporation and others.
diff --git a/cje-production/mbscripts/mb100_cloneRepos.sh b/cje-production/mbscripts/mb100_cloneRepos.sh
index a06fe284c..85ea1de6c 100755
--- a/cje-production/mbscripts/mb100_cloneRepos.sh
+++ b/cje-production/mbscripts/mb100_cloneRepos.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 #*******************************************************************************
 # Copyright (c) 2019 IBM Corporation and others.
diff --git a/cje-production/mbscripts/mb110_tagBuildInputs.sh b/cje-production/mbscripts/mb110_tagBuildInputs.sh
index 6ea011d8f..f09e4f604 100755
--- a/cje-production/mbscripts/mb110_tagBuildInputs.sh
+++ b/cje-production/mbscripts/mb110_tagBuildInputs.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 #*******************************************************************************
 # Copyright (c) 2019 IBM Corporation and others.
diff --git a/cje-production/mbscripts/mb200_createSourceBundles.sh b/cje-production/mbscripts/mb200_createSourceBundles.sh
index 62e509d48..7fd8486c9 100755
--- a/cje-production/mbscripts/mb200_createSourceBundles.sh
+++ b/cje-production/mbscripts/mb200_createSourceBundles.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 #*******************************************************************************
 # Copyright (c) 2019 IBM Corporation and others.
diff --git a/cje-production/mbscripts/mb210_updatePom.sh b/cje-production/mbscripts/mb210_updatePom.sh
index 14d073918..72f0a6b11 100755
--- a/cje-production/mbscripts/mb210_updatePom.sh
+++ b/cje-production/mbscripts/mb210_updatePom.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 #*******************************************************************************
 # Copyright (c) 2019 IBM Corporation and others.
diff --git a/cje-production/mbscripts/mb220_buildSdkPatch.sh b/cje-production/mbscripts/mb220_buildSdkPatch.sh
index 53b9c87ef..9312629e3 100755
--- a/cje-production/mbscripts/mb220_buildSdkPatch.sh
+++ b/cje-production/mbscripts/mb220_buildSdkPatch.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 #*******************************************************************************
 # Copyright (c) 2019 IBM Corporation and others.
@@ -22,8 +22,15 @@ fi
 source $CJE_ROOT/scripts/common-functions.shsource
 source $1
 
+if [[ -z "${WORKSPACE}" ]]
+then
+	MVN_ARGS=""
+else
+	MVN_ARGS="-Pbree-libs -Psign"
+fi
+
 cd $CJE_ROOT/gitCache/eclipse.platform.releng.aggregator
-mvn clean verify -DskipTests=true -Pbree-libs \
+mvn clean verify -DskipTests=true ${MVN_ARGS} \
   -Dtycho.debug.artifactcomparator \
   -Dtycho.localArtifacts=ignore \
   -Dcbi.jarsigner.continueOnFail=true \
diff --git a/cje-production/mbscripts/mb300_gatherEclipseParts.sh b/cje-production/mbscripts/mb300_gatherEclipseParts.sh
index 6010bbce6..e196b537f 100755
--- a/cje-production/mbscripts/mb300_gatherEclipseParts.sh
+++ b/cje-production/mbscripts/mb300_gatherEclipseParts.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 #*******************************************************************************
 # Copyright (c) 2019 IBM Corporation and others.
diff --git a/cje-production/mbscripts/mb310_gatherEquinoxParts.sh b/cje-production/mbscripts/mb310_gatherEquinoxParts.sh
index 3fbfbebb3..960f98734 100755
--- a/cje-production/mbscripts/mb310_gatherEquinoxParts.sh
+++ b/cje-production/mbscripts/mb310_gatherEquinoxParts.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 #*******************************************************************************
 # Copyright (c) 2019 IBM Corporation and others.
diff --git a/cje-production/mbscripts/mb500_createRepoReports.sh b/cje-production/mbscripts/mb500_createRepoReports.sh
index accd85d45..fe651855f 100755
--- a/cje-production/mbscripts/mb500_createRepoReports.sh
+++ b/cje-production/mbscripts/mb500_createRepoReports.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 #*******************************************************************************
 # Copyright (c) 2019 IBM Corporation and others.
diff --git a/cje-production/mbscripts/mb510_createApiToolsReports.sh b/cje-production/mbscripts/mb510_createApiToolsReports.sh
index af7890262..a95d85783 100755
--- a/cje-production/mbscripts/mb510_createApiToolsReports.sh
+++ b/cje-production/mbscripts/mb510_createApiToolsReports.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 #*******************************************************************************
 # Copyright (c) 2019 IBM Corporation and others.