You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/05/21 11:27:23 UTC
[maven] branch MNG-5937 updated: proper position for
$MAVENHOME_CONFIG
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-5937
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/MNG-5937 by this push:
new 1ee3f88 proper position for $MAVENHOME_CONFIG
1ee3f88 is described below
commit 1ee3f881cf11c06d8c8dd509363ea49c2d278f07
Author: rfscholte <rf...@apache.org>
AuthorDate: Thu May 21 13:27:13 2020 +0200
proper position for $MAVENHOME_CONFIG
---
apache-maven/src/assembly/shared/mvnwlauncher | 2 +-
apache-maven/src/assembly/shared/run | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/apache-maven/src/assembly/shared/mvnwlauncher b/apache-maven/src/assembly/shared/mvnwlauncher
index 1fa5e18..dd690b6 100755
--- a/apache-maven/src/assembly/shared/mvnwlauncher
+++ b/apache-maven/src/assembly/shared/mvnwlauncher
@@ -1,4 +1,4 @@
-LAUNCHER_JAR="%MAVEN_PROJECTBASEDIR%/.mvn/wrapper/maven-wrapper.jar"
+LAUNCHER_JAR="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar"
MAVEN_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
MAVENHOME_CONFIG=
diff --git a/apache-maven/src/assembly/shared/run b/apache-maven/src/assembly/shared/run
index 3802d8f..54db55f 100755
--- a/apache-maven/src/assembly/shared/run
+++ b/apache-maven/src/assembly/shared/run
@@ -6,6 +6,5 @@ export MAVEN_CMD_LINE_ARGS
exec "$JAVACMD" \
$MAVEN_OPTS \
-classpath ${LAUNCHER_JAR} \
- $MAVENHOME_CONFIG \
- "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ $MAVENHOME_CONFIG "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
$MAVEN_LAUNCHER $MAVEN_CONFIG "$@"