This is an automated email from the ASF dual-hosted git repository.

henning pushed a commit to branch maven-3.8.x
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/maven-3.8.x by this push:
     new 7a2436d98 Revert "Backport MAVEN_ARGS support to 3.8.x (#781)"
7a2436d98 is described below

commit 7a2436d9844d74763b509af71bca92bbb3c094a1
Author: Henning P. Schmiedehausen <henn...@schmiedehausen.org>
AuthorDate: Fri Jul 29 11:52:42 2022 -0700

    Revert "Backport MAVEN_ARGS support to 3.8.x (#781)"
    
    This feature was only intended for 3.9.x, not onto the 3.8.x branch.
    
    This reverts commit 25381b63e934525b5ee1600bbdb05388918441bf.
---
 apache-maven/src/bin/mvn          | 3 +--
 apache-maven/src/bin/mvn.cmd      | 3 +--
 apache-maven/src/bin/mvnDebug     | 1 -
 apache-maven/src/bin/mvnDebug.cmd | 1 -
 apache-maven/src/bin/mvnyjp       | 1 -
 5 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index a3004f917..dfa384b8e 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -23,7 +23,6 @@
 # Environment Variable Prerequisites
 #
 #   JAVA_HOME       Must point at your Java Development Kit installation.
-#   MAVEN_ARGS      (Optional) Arguments passed to Maven before CLI arguments.
 #   MAVEN_OPTS      (Optional) Java runtime options used when Maven is 
executed.
 #   MAVEN_SKIP_RC   (Optional) Flag to disable loading of mavenrc files.
 # -----------------------------------------------------------------------------
@@ -200,4 +199,4 @@ exec "$JAVACMD" \
   "-Dmaven.home=${MAVEN_HOME}" \
   "-Dlibrary.jansi.path=${MAVEN_HOME}/lib/jansi-native" \
   "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  ${CLASSWORLDS_LAUNCHER} ${MAVEN_ARGS} "$@"
+  ${CLASSWORLDS_LAUNCHER} "$@"
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index b14b9c124..9fb4a98c7 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -21,7 +21,6 @@
 @REM Environment Variable Prerequisites
 @REM
 @REM   JAVA_HOME          Must point at your Java Development Kit installation.
-@REM   MAVEN_ARGS        (Optional) Arguments passed to Maven before CLI 
arguments.
 @REM   MAVEN_BATCH_ECHO  (Optional) Set to 'on' to enable the echoing of the 
batch commands.
 @REM   MAVEN_BATCH_PAUSE (Optional) set to 'on' to wait for a key stroke 
before ending.
 @REM   MAVEN_OPTS        (Optional) Java runtime options used when Maven is 
executed.
@@ -177,7 +176,7 @@ set 
CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
   "-Dmaven.home=%MAVEN_HOME%" ^
   "-Dlibrary.jansi.path=%MAVEN_HOME%\lib\jansi-native" ^
   "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
-  %CLASSWORLDS_LAUNCHER% %MAVEN_ARGS% %MAVEN_CMD_LINE_ARGS%
+  %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
 if ERRORLEVEL 1 goto error
 goto end
 
diff --git a/apache-maven/src/bin/mvnDebug b/apache-maven/src/bin/mvnDebug
index 2d7cafef9..5f6095a98 100755
--- a/apache-maven/src/bin/mvnDebug
+++ b/apache-maven/src/bin/mvnDebug
@@ -23,7 +23,6 @@
 # Environment Variable Prerequisites
 #
 #   JAVA_HOME           Must point at your Java Development Kit installation.
-#   MAVEN_ARGS          (Optional) Arguments passed to Maven before CLI 
arguments.
 #   MAVEN_OPTS          (Optional) Java runtime options used when Maven is 
executed.
 #   MAVEN_SKIP_RC       (Optional) Flag to disable loading of mavenrc files.
 #   MAVEN_DEBUG_ADDRESS (Optional) Set the debug address. Default value is 8000
diff --git a/apache-maven/src/bin/mvnDebug.cmd 
b/apache-maven/src/bin/mvnDebug.cmd
index 9777cf952..6a327ff55 100644
--- a/apache-maven/src/bin/mvnDebug.cmd
+++ b/apache-maven/src/bin/mvnDebug.cmd
@@ -21,7 +21,6 @@
 @REM Environment Variable Prerequisites
 @REM
 @REM   JAVA_HOME           Must point at your Java Development Kit 
installation.
-@REM   MAVEN_ARGS          (Optional) Arguments passed to Maven before CLI 
arguments.
 @REM   MAVEN_BATCH_ECHO    (Optional) Set to 'on' to enable the echoing of the 
batch commands.
 @REM   MAVEN_BATCH_PAUSE   (Optional) set to 'on' to wait for a key stroke 
before ending.
 @REM   MAVEN_OPTS          (Optional) Java runtime options used when Maven is 
executed.
diff --git a/apache-maven/src/bin/mvnyjp b/apache-maven/src/bin/mvnyjp
index 6e21a0ed2..a35eabf1f 100755
--- a/apache-maven/src/bin/mvnyjp
+++ b/apache-maven/src/bin/mvnyjp
@@ -23,7 +23,6 @@
 # Environment Variable Prerequisites
 #
 #   JAVA_HOME       Must point at your Java Development Kit installation.
-#   MAVEN_ARGS      (Optional) Arguments passed to Maven before CLI arguments.
 #   MAVEN_OPTS      (Optional) Java runtime options used when Maven is 
executed.
 #   MAVEN_SKIP_RC   (Optional) Flag to disable loading of mavenrc files.
 # -----------------------------------------------------------------------------

Reply via email to