Align Un*x and Windows scripts to both use MAVEN_CONFIG consistently

Tested on Ubuntu 14.04 and Windows 7 64bit.

Fixes gh-3
This commit is contained in:
Dave Syer 2015-07-16 11:49:29 +01:00 committed by rfscholte
parent 307de3db85
commit ec3d0ccb90
2 changed files with 2 additions and 2 deletions

2
maven-wrapper/mvnw vendored
View File

@ -230,5 +230,5 @@ exec "$JAVACMD" \
$MAVEN_OPTS \ $MAVEN_OPTS \
-classpath "./.mvn/wrapper/maven-wrapper.jar" \ -classpath "./.mvn/wrapper/maven-wrapper.jar" \
"-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
${WRAPPER_LAUNCHER} "$@" ${WRAPPER_LAUNCHER} $MAVEN_CMD_LINE_ARGS

View File

@ -80,7 +80,7 @@ goto error
:init :init
set MAVEN_CMD_LINE_ARGS=%* set MAVEN_CMD_LINE_ARGS=%MAVEN_CONFIG% %*
@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". @REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
@REM Fallback to current working directory if not found. @REM Fallback to current working directory if not found.