You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/11/19 22:44:59 UTC
[isis] branch master updated: ISIS-2181: allows settings.xml to be
passed in as env var to both build-core.sh and build-mixins.sh
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 921c146 ISIS-2181: allows settings.xml to be passed in as env var to both build-core.sh and build-mixins.sh
921c146 is described below
commit 921c146ed0de65a487a40e4c88a980078bc9c6ec
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Nov 19 22:44:32 2019 +0000
ISIS-2181: allows settings.xml to be passed in as env var to both build-core.sh and build-mixins.sh
---
scripts/ci/build-core.sh | 5 ++++-
scripts/ci/build-mixins.sh | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/scripts/ci/build-core.sh b/scripts/ci/build-core.sh
index 99c51a0..74a7a2f 100644
--- a/scripts/ci/build-core.sh
+++ b/scripts/ci/build-core.sh
@@ -19,6 +19,9 @@ fi
if [ -z "$MVN_STAGES" ]; then
MVN_STAGES="clean install"
fi
+if [ -z "$SETTINGS_XML" ]; then
+ SETTINGS_XML=$PROJECT_ROOT_PATH/.m2/settings.xml
+fi
sh $SCRIPT_DIR/print-environment.sh "build-core"
@@ -26,7 +29,7 @@ cd $PROJECT_ROOT_PATH/core-parent
mvn versions:set -DnewVersion=$REVISION -Drevision=$REVISION
-mvn -s $PROJECT_ROOT_PATH/.m2/settings.xml \
+mvn -s $SETTINGS_XML \
--batch-mode \
$MVN_STAGES \
-Drevision=$REVISION \
diff --git a/scripts/ci/build-mixins.sh b/scripts/ci/build-mixins.sh
index def5157..4392cee 100644
--- a/scripts/ci/build-mixins.sh
+++ b/scripts/ci/build-mixins.sh
@@ -19,6 +19,9 @@ fi
if [ -z "$MVN_STAGES" ]; then
MVN_STAGES="clean install"
fi
+if [ -z "$SETTINGS_XML" ]; then
+ SETTINGS_XML=$PROJECT_ROOT_PATH/.m2/settings.xml
+fi
sh $SCRIPT_DIR/print-environment.sh "build-mixins"
@@ -26,7 +29,7 @@ cd $PROJECT_ROOT_PATH/mixins
mvn versions:set -DnewVersion=$REVISION
-mvn -s $PROJECT_ROOT_PATH/.m2/settings.xml \
+mvn -s $SETTINGS_XML \
--batch-mode \
$MVN_STAGES \
-Dskip.mavenmixin-standard \