[maven] branch collapse-mvnDebug-into-mvn updated: Obey batch mode and ignore debug

[michaelo]

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

michaelo pushed a commit to branch collapse-mvnDebug-into-mvn
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/collapse-mvnDebug-into-mvn by 
this push:
     new a327e02  Obey batch mode and ignore debug
a327e02 is described below

commit a327e02c56abaf32d38d7e865b1760c46dabde2d
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Thu Jul 29 10:32:22 2021 +0200

    Obey batch mode and ignore debug
---
 apache-maven/src/assembly/shared/init     | 16 ++++++++++++++++
 apache-maven/src/assembly/shared/init.cmd | 10 ++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/apache-maven/src/assembly/shared/init 
b/apache-maven/src/assembly/shared/init
index 33c6a0e..9e5a46d 100755
--- a/apache-maven/src/assembly/shared/init
+++ b/apache-maven/src/assembly/shared/init
@@ -103,6 +103,22 @@ for arg in "$@"; do
   fi
 done
 
+IGNORE_DEBUG_MODE=0
+ENABLE_DEBUG_MODE=0
+for arg in "$@"; do
+  if [ "$arg" = "-B" -o "$arg" = "--batch-mode" ]; then
+    IGNORE_DEBUG_MODE=1
+  fi
+  if [ "$arg" = "-dj" -o "$arg" = "--debug-java" ]; then
+    ENABLE_DEBUG_MODE=1
+  fi
+done
+
+if [ $IGNORE_DEBUG_MODE -eq 0 -a $ENABLE_DEBUG_MODE -eq 1 ] ; then
+  echo "Preparing to execute Maven in Java debug mode"
+  MAVEN_DEBUG_OPTS="-Xdebug 
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=${MAVEN_DEBUG_ADDRESS:-localhost:8000}"
+fi
+
 # For Cygwin, switch project base directory path to Windows format before
 # executing Maven otherwise this will cause Maven not to consider it.
 if $cygwin ; then
diff --git a/apache-maven/src/assembly/shared/init.cmd 
b/apache-maven/src/assembly/shared/init.cmd
index 9b03ea1..8bf48cd 100755
--- a/apache-maven/src/assembly/shared/init.cmd
+++ b/apache-maven/src/assembly/shared/init.cmd
@@ -91,8 +91,14 @@ for /F "usebackq delims=" %%a in 
("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do s
 :endReadAdditionalConfig
 
 for %%a in (%*) do (
-  if "%%a" == "-dj" goto setMavenDebugOpts
-  if "%%a" == "--debug-java" goto setMavenDebugOpts
+  if "%%a" == "-B" set IGNORE_DEBUG_MODE=1
+  if "%%a" == "--batch-mode" set IGNORE_DEBUG_MODE=1
+  if "%%a" == "-dj" set ENABLE_DEBUG_MODE=1
+  if "%%a" == "--debug-java" set ENABLE_DEBUG_MODE=1
+)
+
+if "%IGNORE_DEBUG_MODE%" == "" (
+  if not "%ENABLE_DEBUG_MODE%" == "" goto setMavenDebugOpts
 )
 goto endSetMavenDebugOpts