diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index c1442ec8d4b6..d57b014ffe6e 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -178,6 +178,7 @@ if [ -z "$JAVA_HOME" ] ; then fi CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher +CLASSWORDS_JAR=`echo "${M2_HOME}"/boot/plexus-classworlds-*.jar` # For Cygwin, switch paths to Windows format before running java if $cygwin; then @@ -187,6 +188,8 @@ if $cygwin; then JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$CLASSWORLDS_JAR" ] && + CLASSWORLDS_JAR=`cygpath --path --windows "$CLASSWORLDS_JAR"` fi # Provide a "standardized" way to retrieve the CLI args that will @@ -196,7 +199,7 @@ export MAVEN_CMD_LINE_ARGS exec "$JAVACMD" \ $MAVEN_OPTS \ - -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \ + -classpath "${CLASSWORLDS_JAR}" \ "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \ "-Dmaven.home=${M2_HOME}" \ ${CLASSWORLDS_LAUNCHER} "$@"