Repository: maven Updated Branches: refs/heads/master ad905af66 -> f104ef885
[MNG-5813] pass debug-opts from mvnDebug to mvn script in the additional env-variable MAVEN_DEBUG_OPTS to not interfere with user-specified MAVEN_OPTS (e.g. when read from .mavenrc). Fixed as suggested by Robert Patrick on the ML Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f104ef88 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f104ef88 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f104ef88 Branch: refs/heads/master Commit: f104ef88507bb8b03c9cfe183c9cd6791305e4f7 Parents: ad905af Author: Andreas Gudian <agud...@apache.org> Authored: Sat Jun 27 17:41:33 2015 +0200 Committer: Andreas Gudian <agud...@apache.org> Committed: Sat Jun 27 17:41:33 2015 +0200 ---------------------------------------------------------------------- apache-maven/src/bin/mvn | 1 + apache-maven/src/bin/mvnDebug | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/f104ef88/apache-maven/src/bin/mvn ---------------------------------------------------------------------- diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index db0960b..4940a52 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -235,6 +235,7 @@ export MAVEN_CMD_LINE_ARGS exec "$JAVACMD" \ $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \ "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ http://git-wip-us.apache.org/repos/asf/maven/blob/f104ef88/apache-maven/src/bin/mvnDebug ---------------------------------------------------------------------- diff --git a/apache-maven/src/bin/mvnDebug b/apache-maven/src/bin/mvnDebug index 73905fd..a1077ce 100755 --- a/apache-maven/src/bin/mvnDebug +++ b/apache-maven/src/bin/mvnDebug @@ -38,4 +38,4 @@ MAVEN_DEBUG_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,addre echo Preparing to Execute Maven in Debug Mode -env MAVEN_OPTS="$MAVEN_OPTS $MAVEN_DEBUG_OPTS" $(dirname $0)/mvn "$@" +env MAVEN_OPTS="$MAVEN_OPTS" MAVEN_DEBUG_OPTS="$MAVEN_DEBUG_OPTS" $(dirname $0)/mvn "$@"
