Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-4767] Regression in parsing command-line arguments including variables 

Submitted by: Jesse Glick

o Duplicated patch to mvnDebug as well

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@989236 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2010-08-25 17:26:09 +00:00
parent 6b82e83024
commit 05d9ee3cfb
2 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apache-maven/src/bin/mvn
View File

@ -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} "$@"

20
apache-maven/src/bin/mvnDebug
View File

@ -37,14 +37,6 @@ MAVEN_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_
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} "$@"