You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/08/25 19:26:09 UTC
svn commit: r989236 - in /maven/maven-3/trunk/apache-maven/src/bin: mvn
mvnDebug
Author: bentmann
Date: Wed Aug 25 17:26:09 2010
New Revision: 989236
URL: http://svn.apache.org/viewvc?rev=989236&view=rev
Log:
[MNG-4767] Regression in parsing command-line arguments including variables
Submitted by: Jesse Glick
o Duplicated patch to mvnDebug as well
Modified:
maven/maven-3/trunk/apache-maven/src/bin/mvn
maven/maven-3/trunk/apache-maven/src/bin/mvnDebug
Modified: maven/maven-3/trunk/apache-maven/src/bin/mvn
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/bin/mvn?rev=989236&r1=989235&r2=989236&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/src/bin/mvn (original)
+++ maven/maven-3/trunk/apache-maven/src/bin/mvn Wed Aug 25 17:26:09 2010
@@ -33,14 +33,6 @@
# set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
# ----------------------------------------------------------------------------
-QUOTED_ARGS=""
-while [ "$1" != "" ] ; do
-
- QUOTED_ARGS="$QUOTED_ARGS \"$1\""
- shift
-
-done
-
if [ -f /etc/mavenrc ] ; then
. /etc/mavenrc
fi
@@ -154,11 +146,9 @@ if $cygwin; then
HOME=`cygpath --path --windows "$HOME"`
fi
-maven_exec_cmd="\"$JAVACMD\" \
+exec "$JAVACMD" \
$MAVEN_OPTS \
- -classpath \"${M2_HOME}\"/boot/plexus-classworlds-*.jar \
- \"-Dclassworlds.conf=${M2_HOME}/bin/m2.conf\" \
- \"-Dmaven.home=${M2_HOME}\" \
- ${CLASSWORLDS_LAUNCHER}"
-
-eval $maven_exec_cmd "$QUOTED_ARGS"
+ -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
+ "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
+ "-Dmaven.home=${M2_HOME}" \
+ ${CLASSWORLDS_LAUNCHER} "$@"
Modified: maven/maven-3/trunk/apache-maven/src/bin/mvnDebug
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/bin/mvnDebug?rev=989236&r1=989235&r2=989236&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/src/bin/mvnDebug (original)
+++ maven/maven-3/trunk/apache-maven/src/bin/mvnDebug Wed Aug 25 17:26:09 2010
@@ -37,14 +37,6 @@ MAVEN_DEBUG_OPTS="-Xdebug -Xnoagent -Dja
echo Preparing to Execute Maven in Debug Mode
-QUOTED_ARGS=""
-while [ "$1" != "" ] ; do
-
- QUOTED_ARGS="$QUOTED_ARGS \"$1\""
- shift
-
-done
-
if [ -f /etc/mavenrc ] ; then
. /etc/mavenrc
fi
@@ -158,12 +150,10 @@ if $cygwin; then
HOME=`cygpath --path --windows "$HOME"`
fi
-maven_exec_cmd="\"$JAVACMD\" \
+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}\" \
- ${CLASSWORLDS_LAUNCHER}"
-
-eval $maven_exec_cmd "$QUOTED_ARGS"
+ -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
+ "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
+ "-Dmaven.home=${M2_HOME}" \
+ ${CLASSWORLDS_LAUNCHER} "$@"