From bad93cff627169b7d34c2a315bbf130ecbfd1215 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 3 Jan 2019 10:55:48 +0100 Subject: [PATCH] Apply MAVEN_PARAMS in multipatch-build multipatch-distribution.sh should apply the MAVEN_PARAMS settings which can be provided via the Jenkins build options. This patch includes MAVEN_PARAMS in MAVEN_OPTIONS; it also cleans up the variable declaration. Change-Id: I41ca01e593a789cb7855bf050a96be5d1a141ac0 Signed-off-by: Stephen Kitt --- jjb/integration/multipatch-distribution.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jjb/integration/multipatch-distribution.sh b/jjb/integration/multipatch-distribution.sh index 82220dff3..2db7b71d1 100755 --- a/jjb/integration/multipatch-distribution.sh +++ b/jjb/integration/multipatch-distribution.sh @@ -5,12 +5,13 @@ set -e # create a fresh empty place to build this custom distribution BUILD_DIR=${WORKSPACE}/patch_tester DISTRIBUTION_BRANCH_TO_BUILD=$DISTROBRANCH #renaming variable for clarity -MAVEN_OPTIONS="$(echo --show-version \ +MAVEN_OPTIONS="${MAVEN_PARAMS} \ + --show-version \ --batch-mode \ -Djenkins \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -Dmaven.repo.local=/tmp/r \ - -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r)" + -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r" rm -rf $BUILD_DIR mkdir -p $BUILD_DIR -- 2.36.6