Repository: maven Updated Branches: refs/heads/MNG-5878 9d28cf1aa -> 604a95f57 (forced update)
[MNG-6163] Introduce CLASSWORLDS_JAR in shell startup scripts This commit was previously for MNG-5538 and closes #27. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4337d18a Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4337d18a Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4337d18a Branch: refs/heads/MNG-5878 Commit: 4337d18af65df8d3221bdd1e393f13c5f4db9054 Parents: b928546 Author: Arlo Louis O'Keeffe <mailtoa...@gmail.com> Authored: Wed Oct 29 09:07:45 2014 +0100 Committer: Michael Osipov <micha...@apache.org> Committed: Sun Jan 29 16:00:35 2017 +0100 ---------------------------------------------------------------------- apache-maven/src/bin/mvn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/4337d18a/apache-maven/src/bin/mvn ---------------------------------------------------------------------- diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index f3acb73..567e469 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -182,6 +182,7 @@ if [ -z "$JAVA_HOME" ] ; then echo "Warning: JAVA_HOME environment variable is not set." fi +CLASSWORLDS_JAR=`echo "${M2_HOME}"/boot/plexus-classworlds-*.jar` CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher # For Cygwin, switch paths to Windows format before running java @@ -192,6 +193,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 # traverses directory structure from process work directory to filesystem root @@ -238,7 +241,7 @@ export MAVEN_CMD_LINE_ARGS exec "$JAVACMD" \ $MAVEN_OPTS \ $MAVEN_DEBUG_OPTS \ - -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \ + -classpath "${CLASSWORLDS_JAR}" \ "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ "-Dlibrary.jansi.path=${MAVEN_HOME}/lib/ext" \
