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/07/26 18:11:01 UTC
[maven] branch collapse-mvnDebug-into-mvn updated (ff10425 ->
5d397d0)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch collapse-mvnDebug-into-mvn
in repository https://gitbox.apache.org/repos/asf/maven.git.
from ff10425 Bourne Shell
new e49b384 Add CLI param -dj
new dae4266 Fix short option
new 5d397d0 Windows Command prompt
The 3 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/init | 2 +-
apache-maven/src/assembly/shared/init.cmd | 11 +++++++++++
.../src/main/java/org/apache/maven/cli/CLIManager.java | 3 +++
3 files changed, 15 insertions(+), 1 deletion(-)
[maven] 03/03: Windows Command prompt
Posted by mi...@apache.org.
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
commit 5d397d03e8e0e95f6be3604a2d1c4e14ab9208fc
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jul 26 20:10:43 2021 +0200
Windows Command prompt
---
apache-maven/src/assembly/shared/init.cmd | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/apache-maven/src/assembly/shared/init.cmd b/apache-maven/src/assembly/shared/init.cmd
index 10758df..0349780 100755
--- a/apache-maven/src/assembly/shared/init.cmd
+++ b/apache-maven/src/assembly/shared/init.cmd
@@ -90,3 +90,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
+)
+goto endSetMavenDebugOpts
+
+:setMavenDebugOpts
+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%
+
+:endSetMavenDebugOpts
[maven] 02/03: Fix short option
Posted by mi...@apache.org.
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
commit dae426680b98a0c4fcfec22b147f6e3439871e9f
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jul 26 19:59:23 2021 +0200
Fix short option
---
apache-maven/src/assembly/shared/init | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apache-maven/src/assembly/shared/init b/apache-maven/src/assembly/shared/init
index d407a99..46e36fd 100755
--- a/apache-maven/src/assembly/shared/init
+++ b/apache-maven/src/assembly/shared/init
@@ -96,7 +96,7 @@ MAVEN_PROJECTBASEDIR="`find_maven_basedir "$@"`"
MAVEN_OPTS="`concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config"` $MAVEN_OPTS"
for arg in "$@"; do
- if [ "$arg" = "-Xd" -o "$arg" = "--debug-java" ]; then
+ if [ "$arg" = "-dj" -o "$arg" = "--debug-java" ]; 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}"
break
[maven] 01/03: Add CLI param -dj
Posted by mi...@apache.org.
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
commit e49b3844eabf9436fa694d8538c0d21f3acdfaa3
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jul 26 19:52:29 2021 +0200
Add CLI param -dj
---
maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
index fec2bda..7177bc0 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
@@ -110,6 +110,8 @@ public class CLIManager
public static final String COLOR = "color";
+ public static final String DEBUG_JAVA = "dj";
+
protected Options options;
@SuppressWarnings( "checkstyle:linelength" )
@@ -153,6 +155,7 @@ public class CLIManager
options.addOption( Option.builder( BUILDER ).longOpt( "builder" ).hasArg().desc( "The id of the build strategy to use" ).build() );
options.addOption( Option.builder( NO_TRANSFER_PROGRESS ).longOpt( "no-transfer-progress" ).desc( "Do not display transfer progress when downloading or uploading" ).build() );
options.addOption( Option.builder().longOpt( COLOR ).hasArg().optionalArg( true ).desc( "Defines the color mode of the output. Supported are 'auto', 'always', 'never'." ).build() );
+ options.addOption( Option.builder( DEBUG_JAVA ).longOpt( "debug-java" ).desc( "Start Maven in Java debug mode" ).build() );
}
public CommandLine parse( String[] args )