From ec3d0ccb90f8bb22098a3c9db30d39a58b2d5cdc Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 16 Jul 2015 11:49:29 +0100 Subject: [PATCH] Align Un*x and Windows scripts to both use MAVEN_CONFIG consistently Tested on Ubuntu 14.04 and Windows 7 64bit. Fixes gh-3 --- maven-wrapper/mvnw | 2 +- maven-wrapper/mvnw.cmd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-wrapper/mvnw b/maven-wrapper/mvnw index 4daefb526f..2b5b25b767 100755 --- a/maven-wrapper/mvnw +++ b/maven-wrapper/mvnw @@ -230,5 +230,5 @@ exec "$JAVACMD" \ $MAVEN_OPTS \ -classpath "./.mvn/wrapper/maven-wrapper.jar" \ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} "$@" + ${WRAPPER_LAUNCHER} $MAVEN_CMD_LINE_ARGS diff --git a/maven-wrapper/mvnw.cmd b/maven-wrapper/mvnw.cmd index fc83024320..2ce7b7bc75 100644 --- a/maven-wrapper/mvnw.cmd +++ b/maven-wrapper/mvnw.cmd @@ -80,7 +80,7 @@ goto error :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 Fallback to current working directory if not found.