Permalink
Browse files

JBPAPP-8145 build.sh, integration-tests.sh use AS 7's settings.xml in…

…stead of mead's one for ZIP repo.
  • Loading branch information...
1 parent 2f3255b commit 1e8ee7fa136497bb8e0f5568edce5d7e529b4cfa Ondrej Zizka committed with bstansberry Mar 3, 2012
Showing with 10 additions and 8 deletions.
  1. +10 −8 build.sh
View
18 build.sh
@@ -29,11 +29,7 @@ MAVEN_SEARCH_PATH="\
tools/apache/maven \
maven"
-# Default arguments
-if [ "$MVN_OPTIONS" = "" ]
- then
- MVN_OPTIONS="-s tools/maven/conf/settings.xml"
-fi
+
# Use the maximum available, or set MAX_FD != -1 to use that
MAX_FD="maximum"
@@ -162,12 +158,15 @@ main() {
. testsuite/groupDefs.sh
# Add smoke integration test directives before calling maven.
+ MVN_SETTINGS_XML_ARGS="-s tools/maven/conf/settings.xml"
TESTS=$SMOKE_TESTS
MVN_GOAL="";
ADDIT_PARAMS="";
# For each parameter, check for testsuite directives.
for param in $@ ; do
case $param in
+ ## -s .../settings.xml - don't use our own.
+ -s) MVN_SETTINGS_XML_ARGS=""; ADDIT_PARAMS="$ADDIT_PARAMS $param";;
-*) ADDIT_PARAMS="$ADDIT_PARAMS $param";;
clean) MVN_GOAL="$MVN_GOAL$param ";;
test) MVN_GOAL="$MVN_GOAL$param ";;
@@ -185,13 +184,16 @@ main() {
# Export some stuff for maven.
export MVN MAVEN_HOME MVN_OPTS MVN_GOAL
- echo "$MVN $MVN_OPTIONS $MVN_GOAL $ADDIT_PARAMS"
+ # The default arguments. `mvn -s ...` will override this.
+ MVN_ARGS=${MVN_ARGS:-"$MVN_SETTINGS_XML_ARGS"};
+
+ echo "$MVN $MVN_ARGS $MVN_GOAL $ADDIT_PARAMS"
# Execute in debug mode, or simply execute.
if [ "x$MVN_DEBUG" != "x" ]; then
- /bin/sh -x $MVN $MVN_OPTIONS $MVN_GOAL $ADDIT_PARAMS
+ /bin/sh -x $MVN $MVN_ARGS $MVN_GOAL $ADDIT_PARAMS
else
- exec $MVN $MVN_OPTIONS $MVN_GOAL $ADDIT_PARAMS
+ exec $MVN $MVN_ARGS $MVN_GOAL $ADDIT_PARAMS
fi
}

0 comments on commit 1e8ee7f

Please sign in to comment.