You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2021/08/01 13:39:06 UTC
[maven] branch MNG-7199 updated (e44d667 -> 750cb6c)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-7199
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard e44d667 [MNG-7199] MAVENHOME_CONFIG var in mvnlauncher script improperly handles two options at once
new 750cb6c [MNG-7199] MAVENHOME_CONFIG var in mvnlauncher script improperly handles two options at once
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (e44d667)
\
N -- N -- N refs/heads/MNG-7199 (750cb6c)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
apache-maven/src/assembly/shared/init | 2 +-
apache-maven/src/assembly/shared/init.cmd | 2 +-
apache-maven/src/assembly/shared/run.cmd | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
[maven] 01/01: [MNG-7199] MAVENHOME_CONFIG var in mvnlauncher
script improperly handles two options at once
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-7199
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 750cb6cb15c8f8d272ae3dc071f9f5377c441baf
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jul 29 13:13:31 2021 +0200
[MNG-7199] MAVENHOME_CONFIG var in mvnlauncher script improperly handles two options at once
This closes #518
---
apache-maven/src/assembly/shared/init | 2 ++
apache-maven/src/assembly/shared/init.cmd | 2 ++
apache-maven/src/assembly/shared/mvnlauncher | 1 -
apache-maven/src/assembly/shared/mvnlauncher.cmd | 1 -
apache-maven/src/assembly/shared/mvnwlauncher | 1 -
apache-maven/src/assembly/shared/mvnwlauncher.cmd | 1 -
apache-maven/src/assembly/shared/run | 3 ++-
apache-maven/src/assembly/shared/run.cmd | 3 ++-
8 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/apache-maven/src/assembly/shared/init b/apache-maven/src/assembly/shared/init
index 5b476ca..d1c79b2 100755
--- a/apache-maven/src/assembly/shared/init
+++ b/apache-maven/src/assembly/shared/init
@@ -1,3 +1,5 @@
+CLASSWORLDS_CONF="${MAVEN_HOME}/bin/m2.conf"
+
# For Cygwin, ensure paths are in Unix format before anything is touched
if $cygwin ; then
[ -n "$MAVEN_HOME" ] &&
diff --git a/apache-maven/src/assembly/shared/init.cmd b/apache-maven/src/assembly/shared/init.cmd
index 10758df..8b1eb67 100755
--- a/apache-maven/src/assembly/shared/init.cmd
+++ b/apache-maven/src/assembly/shared/init.cmd
@@ -2,6 +2,8 @@
:init
+set "CLASSWORLDS_CONF=%MAVEN_HOME%\bin\m2.conf"
+
@REM Find the project basedir, i.e., the directory that contains the directory ".mvn".
@REM Fallback to current working directory if not found.
diff --git a/apache-maven/src/assembly/shared/mvnlauncher b/apache-maven/src/assembly/shared/mvnlauncher
index 9c84338..943239b 100644
--- a/apache-maven/src/assembly/shared/mvnlauncher
+++ b/apache-maven/src/assembly/shared/mvnlauncher
@@ -1,4 +1,3 @@
LAUNCHER_JAR=`echo "${MAVEN_HOME}"/boot/plexus-classworlds-*.jar`
MAVEN_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-MAVENHOME_CONFIG=`echo "-Dclassworlds.conf=${MAVEN_HOME}/bin/m2.conf" "-Dmaven.home=${MAVEN_HOME}"`
diff --git a/apache-maven/src/assembly/shared/mvnlauncher.cmd b/apache-maven/src/assembly/shared/mvnlauncher.cmd
index d9a9687..be2f9a9 100644
--- a/apache-maven/src/assembly/shared/mvnlauncher.cmd
+++ b/apache-maven/src/assembly/shared/mvnlauncher.cmd
@@ -1,4 +1,3 @@
for %%i in ("%MAVEN_HOME%"\boot\plexus-classworlds-*) do set LAUNCHER_JAR="%%i"
set MAVEN_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-set MAVENHOME_CONFIG="-Dclassworlds.conf=%MAVEN_HOME%\bin\m2.conf" "-Dmaven.home=%MAVEN_HOME%"
diff --git a/apache-maven/src/assembly/shared/mvnwlauncher b/apache-maven/src/assembly/shared/mvnwlauncher
index dd690b6..39ba322 100755
--- a/apache-maven/src/assembly/shared/mvnwlauncher
+++ b/apache-maven/src/assembly/shared/mvnwlauncher
@@ -1,4 +1,3 @@
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/mvnwlauncher.cmd b/apache-maven/src/assembly/shared/mvnwlauncher.cmd
index 9d9685d..46cad98 100755
--- a/apache-maven/src/assembly/shared/mvnwlauncher.cmd
+++ b/apache-maven/src/assembly/shared/mvnwlauncher.cmd
@@ -1,4 +1,3 @@
set LAUNCHER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
set MAVEN_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-set MAVENHOME_CONFIG=
diff --git a/apache-maven/src/assembly/shared/run b/apache-maven/src/assembly/shared/run
index 55550eb..7e8d72a 100755
--- a/apache-maven/src/assembly/shared/run
+++ b/apache-maven/src/assembly/shared/run
@@ -14,6 +14,7 @@ exec "$JAVACMD" \
$MAVEN_OPTS \
$MAVEN_DEBUG_OPTS \
-classpath "${LAUNCHER_JAR}" \
- $MAVENHOME_CONFIG \
+ "-Dclassworlds.conf=$CLASSWORLDS_CONF" \
+ "-Dmaven.home=$MAVEN_HOME" \
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
$MAVEN_LAUNCHER "$@"
diff --git a/apache-maven/src/assembly/shared/run.cmd b/apache-maven/src/assembly/shared/run.cmd
index 1aeae16..717dea6 100755
--- a/apache-maven/src/assembly/shared/run.cmd
+++ b/apache-maven/src/assembly/shared/run.cmd
@@ -3,7 +3,8 @@
%MAVEN_OPTS% ^
%MAVEN_DEBUG_OPTS% ^
-classpath %LAUNCHER_JAR% ^
- %MAVENHOME_CONFIG% ^
+ "-Dclassworlds.conf=%CLASSWORLDS_CONF%" ^
+ "-Dmaven.home=%MAVEN_HOME%" ^
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
%MAVEN_LAUNCHER% %*
if ERRORLEVEL 1 goto error