You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/03/27 14:26:47 UTC
[maven-verifier] branch MSHARED-855 updated: Support mvnwDebug
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MSHARED-855
in repository https://gitbox.apache.org/repos/asf/maven-verifier.git
The following commit(s) were added to refs/heads/MSHARED-855 by this push:
new 090554b Support mvnwDebug
090554b is described below
commit 090554be708a705ad300072ee1568ca8e0a4d7a5
Author: rfscholte <rf...@apache.org>
AuthorDate: Fri Mar 27 15:26:34 2020 +0100
Support mvnwDebug
---
.../java/org/apache/maven/it/ForkedLauncher.java | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/maven/it/ForkedLauncher.java b/src/main/java/org/apache/maven/it/ForkedLauncher.java
index 4cc2b47..3607be1 100644
--- a/src/main/java/org/apache/maven/it/ForkedLauncher.java
+++ b/src/main/java/org/apache/maven/it/ForkedLauncher.java
@@ -67,19 +67,23 @@ class ForkedLauncher
this.mavenHome = mavenHome;
this.envVars = envVars;
- String script = debugJvm ? "mvnDebug" : "mvn";
-
if ( wrapper )
{
- executable = new File( "mvnw" ).getPath();
- }
- else if ( mavenHome != null )
- {
- executable = new File( mavenHome, "bin/" + script ).getPath();
+ String script = "mvnw" + ( debugJvm ? "Debug" : "" );
+ executable = new File( script ).getPath();
}
else
{
- executable = script;
+ String script = "mvn" + ( debugJvm ? "Debug" : "" );
+
+ if ( mavenHome != null )
+ {
+ executable = new File( mavenHome, "bin/" + script ).getPath();
+ }
+ else
+ {
+ executable = script;
+ }
}
}