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/05/02 15:26:44 UTC
[maven] branch MNG-7149 created (now 03c7c8a)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-7149
in repository https://gitbox.apache.org/repos/asf/maven.git.
at 03c7c8a [MNG-7149] Introduce MAVEN_DEBUG_ADDRESS in mvnDebug scripts
This branch includes the following new commits:
new 32cdc2e [MNG-7090] mvnDebug does not work on Java 11+ Submitted by: Guillaume Dufour
new 03c7c8a [MNG-7149] Introduce MAVEN_DEBUG_ADDRESS in mvnDebug scripts
The 2 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.
[maven] 01/02: [MNG-7090] mvnDebug does not work on Java 11+
Submitted by: Guillaume Dufour
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-7149
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 32cdc2ec3cf265873b23790ab1eefa98efff59a8
Author: Guillaume Dufour <gu...@gmail.com>
AuthorDate: Sun Apr 25 18:35:47 2021 +0200
[MNG-7090] mvnDebug does not work on Java 11+
Submitted by: Guillaume Dufour
mvnDebug socket binds on 0.0.0.0
---
apache-maven/src/assembly/shared/mvnwDebug | 2 +-
apache-maven/src/assembly/shared/mvnwDebug.cmd | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apache-maven/src/assembly/shared/mvnwDebug b/apache-maven/src/assembly/shared/mvnwDebug
index d67dc0d..4a4089a 100644
--- a/apache-maven/src/assembly/shared/mvnwDebug
+++ b/apache-maven/src/assembly/shared/mvnwDebug
@@ -27,7 +27,7 @@
# MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files.
# -----------------------------------------------------------------------------
-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=0.0.0.0:8000"
echo Preparing to execute Maven Wrapper in debug mode
diff --git a/apache-maven/src/assembly/shared/mvnwDebug.cmd b/apache-maven/src/assembly/shared/mvnwDebug.cmd
index 2c4face..e3ad7c9 100644
--- a/apache-maven/src/assembly/shared/mvnwDebug.cmd
+++ b/apache-maven/src/assembly/shared/mvnwDebug.cmd
@@ -28,6 +28,6 @@
@REM -----------------------------------------------------------------------------
@setlocal
-@set MAVEN_DEBUG_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@set MAVEN_DEBUG_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=0.0.0.0:8000
@call "%~dp0"mvnw.cmd %*
[maven] 02/02: [MNG-7149] Introduce MAVEN_DEBUG_ADDRESS in mvnDebug
scripts
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-7149
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 03c7c8ad909b17365a2ae4faaf75f6a52f1f07ab
Author: Guillaume Dufour <gu...@gmail.com>
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 localhost:8000. set MAVEN_DEBUG_ADDRESS
environment variable to choose another address (host:port).
This closes #469
---
apache-maven/src/assembly/maven/bin/mvnDebug | 9 +++++----
apache-maven/src/assembly/maven/bin/mvnDebug.cmd | 16 ++++++++++------
apache-maven/src/assembly/shared/mvnwDebug | 9 +++++----
apache-maven/src/assembly/shared/mvnwDebug.cmd | 16 ++++++++++------
4 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/apache-maven/src/assembly/maven/bin/mvnDebug b/apache-maven/src/assembly/maven/bin/mvnDebug
index be495ff..67bd4cf 100644
--- a/apache-maven/src/assembly/maven/bin/mvnDebug
+++ b/apache-maven/src/assembly/maven/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 localhost: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:-localhost:8000}"
echo Preparing to execute Maven in debug mode
diff --git a/apache-maven/src/assembly/maven/bin/mvnDebug.cmd b/apache-maven/src/assembly/maven/bin/mvnDebug.cmd
index 5f9a20a..82e1acc 100644
--- a/apache-maven/src/assembly/maven/bin/mvnDebug.cmd
+++ b/apache-maven/src/assembly/maven/bin/mvnDebug.cmd
@@ -20,14 +20,18 @@
@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 localhost:8000
@REM -----------------------------------------------------------------------------
@setlocal
-@set MAVEN_DEBUG_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+
+IF "%MAVEN_DEBUG_ADDRESS%"=="" @set MAVEN_DEBUG_ADDRESS=localhost:8000
+
+@set MAVEN_DEBUG_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=%MAVEN_DEBUG_ADDRESS%
@call "%~dp0"mvn.cmd %*
diff --git a/apache-maven/src/assembly/shared/mvnwDebug b/apache-maven/src/assembly/shared/mvnwDebug
index 4a4089a..57d554e 100644
--- a/apache-maven/src/assembly/shared/mvnwDebug
+++ b/apache-maven/src/assembly/shared/mvnwDebug
@@ -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 localhost:8000
# -----------------------------------------------------------------------------
-MAVEN_DEBUG_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=0.0.0.0:8000"
+MAVEN_DEBUG_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=${MAVEN_DEBUG_ADDRESS:-localhost:8000}"
echo Preparing to execute Maven Wrapper in debug mode
diff --git a/apache-maven/src/assembly/shared/mvnwDebug.cmd b/apache-maven/src/assembly/shared/mvnwDebug.cmd
index e3ad7c9..f84f29c 100644
--- a/apache-maven/src/assembly/shared/mvnwDebug.cmd
+++ b/apache-maven/src/assembly/shared/mvnwDebug.cmd
@@ -20,14 +20,18 @@
@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 localhost:8000
@REM -----------------------------------------------------------------------------
@setlocal
-@set MAVEN_DEBUG_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=0.0.0.0:8000
+
+IF "%MAVEN_DEBUG_ADDRESS%"=="" @set MAVEN_DEBUG_ADDRESS=localhost:8000
+
+@set MAVEN_DEBUG_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=%MAVEN_DEBUG_ADDRESS%
@call "%~dp0"mvnw.cmd %*