[maven] branch MNG-7193 updated (fb32dcd -> 6257b33)

[mi...@apache.org]

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

michaelo pushed a change to branch MNG-7193
in repository https://gitbox.apache.org/repos/asf/maven.git.


 discard fb32dcd  [MNG-7193] Introduce MAVEN_ARGS environment variable
     new 6257b33  [MNG-7193] Introduce MAVEN_ARGS environment variable

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   (fb32dcd)
            \
             N -- N -- N   refs/heads/MNG-7193 (6257b33)

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/validate     | 2 +-
 apache-maven/src/assembly/shared/validate.cmd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[maven] 01/01: [MNG-7193] Introduce MAVEN_ARGS environment variable

[mi...@apache.org]

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

michaelo pushed a commit to branch MNG-7193
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 6257b3314282f795ded9366a52eae627a4206395
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Dec 20 21:53:45 2021 +0100

    [MNG-7193] Introduce MAVEN_ARGS environment variable
    
    Add args directly after the class name and leave users the option to override
    with maven.config or CLI args.
    
    This closes #637
---
 apache-maven/src/assembly/shared/run          | 1 +
 apache-maven/src/assembly/shared/run.cmd      | 1 +
 apache-maven/src/assembly/shared/validate     | 1 +
 apache-maven/src/assembly/shared/validate.cmd | 1 +
 4 files changed, 4 insertions(+)

diff --git a/apache-maven/src/assembly/shared/run b/apache-maven/src/assembly/shared/run
index b89ecc7..28814a8 100755
--- a/apache-maven/src/assembly/shared/run
+++ b/apache-maven/src/assembly/shared/run
@@ -17,4 +17,5 @@ exec "$JAVACMD" \
   "-Dlibrary.jansi.path=${MAVEN_HOME}/lib/jansi-native" \
   "-Dmaven.multiModuleProjectDirectory=$MAVEN_PROJECTBASEDIR" \
   $LAUNCHER_CLASS \
+  $MAVEN_ARGS \
   "$@"
diff --git a/apache-maven/src/assembly/shared/run.cmd b/apache-maven/src/assembly/shared/run.cmd
index ab6da36..71a9c05 100755
--- a/apache-maven/src/assembly/shared/run.cmd
+++ b/apache-maven/src/assembly/shared/run.cmd
@@ -8,6 +8,7 @@
   "-Dlibrary.jansi.path=%MAVEN_HOME%\lib\jansi-native" ^
   "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
   %LAUNCHER_CLASS% ^
+  %MAVEN_ARGS% ^
   %*
 if ERRORLEVEL 1 goto error
 goto end
diff --git a/apache-maven/src/assembly/shared/validate b/apache-maven/src/assembly/shared/validate
index 0d22a8b..449e23b 100644
--- a/apache-maven/src/assembly/shared/validate
+++ b/apache-maven/src/assembly/shared/validate
@@ -23,6 +23,7 @@
 # Environment Variable Prerequisites
 #
 #   JAVA_HOME       (Optional) Points to a Java 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.
 # -----------------------------------------------------------------------------
diff --git a/apache-maven/src/assembly/shared/validate.cmd b/apache-maven/src/assembly/shared/validate.cmd
index dc68027..7920741 100644
--- a/apache-maven/src/assembly/shared/validate.cmd
+++ b/apache-maven/src/assembly/shared/validate.cmd
@@ -21,6 +21,7 @@
 @REM Environment Variable Prerequisites
 @REM
 @REM   JAVA_HOME         (Optional) Points to a Java 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.