This is an automated email from the ASF dual-hosted git repository.
michaelo 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 8edac61 [MNG-7149] Introduce MAVEN_DEBUG_ADDRESS in mvnDebug scripts
8edac61 is described below
commit 8edac61ae51029ce73f5f4cabd2b5652556d5090
Author: Guillaume Dufour <[email protected]>
AuthorDate: Sun Apr 25 21:10:31 2021 +0200
[MNG-7149] Introduce MAVEN_DEBUG_ADDRESS in mvnDebug scripts
mvnDebug socket now binds by default on 8000. set MAVEN_DEBUG_ADDRESS
environment variable to choose another address (host:port).
This closes #469
---
apache-maven/src/bin/mvnDebug | 9 +++++----
apache-maven/src/bin/mvnDebug.cmd | 23 +++++++++++++++++------
2 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/apache-maven/src/bin/mvnDebug b/apache-maven/src/bin/mvnDebug
index be495ff..5f6095a 100755
--- a/apache-maven/src/bin/mvnDebug
+++ b/apache-maven/src/bin/mvnDebug
@@ -22,12 +22,13 @@
#
# Environment Variable Prerequisites
#
-# JAVA_HOME Must point at your Java Development Kit installation.
-# MAVEN_OPTS (Optional) Java runtime options used when Maven is
executed.
-# MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files.
+# JAVA_HOME Must point at your Java Development Kit installation.
+# 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
# -----------------------------------------------------------------------------
-MAVEN_DEBUG_OPTS="-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
+MAVEN_DEBUG_OPTS="-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=${MAVEN_DEBUG_ADDRESS:-8000}"
echo Preparing to execute Maven in debug mode
diff --git a/apache-maven/src/bin/mvnDebug.cmd
b/apache-maven/src/bin/mvnDebug.cmd
index 5f9a20a..6a327ff 100644
--- a/apache-maven/src/bin/mvnDebug.cmd
+++ b/apache-maven/src/bin/mvnDebug.cmd
@@ -20,14 +20,25 @@
@REM
@REM Environment Variable Prerequisites
@REM
-@REM JAVA_HOME Must point at your Java Development Kit installation.
-@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.
-@REM MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files.
+@REM JAVA_HOME Must point at your Java Development Kit
installation.
+@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.
+@REM MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files.
+@REM MAVEN_DEBUG_ADDRESS (Optional) Set the debug address. Default value is
8000
@REM
-----------------------------------------------------------------------------
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%"=="on" echo %MAVEN_BATCH_ECHO%
+
@setlocal
-@set MAVEN_DEBUG_OPTS=-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+
+IF "%MAVEN_DEBUG_ADDRESS%"=="" @set MAVEN_DEBUG_ADDRESS=8000
+
+@set MAVEN_DEBUG_OPTS=-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=%MAVEN_DEBUG_ADDRESS%
@call "%~dp0"mvn.cmd %*
