View | Details | Raw Unified | Return to bug 204239
Collapse All | Expand All

(-)files/mvn.sh.in (-13 / +7 lines)
Lines 34-51 Link Here
34
  fi
34
  fi
35
}
35
}
36
36
37
export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
37
MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
38
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
38
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
39
39
40
# Provide a "standardized" way to retrieve the CLI args that will 
40
JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" $MAVEN_OPTS \
41
# work with both Windows and non-Windows executions.
41
	-classpath "${M2_HOME}/boot/%%CLASSWORLDS_JAR%%" \
42
MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
42
	"-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
43
export MAVEN_CMD_LINE_ARGS
43
	"-Dmaven.home=${M2_HOME}" \
44
44
	"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
45
JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" \
45
	org.codehaus.classworlds.Launcher "$@"
46
  $MAVEN_OPTS \
47
  -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
48
  "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
49
  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
50
  ${CLASSWORLDS_LAUNCHER} "$@"
51

Return to bug 204239