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/05/03 11:12:13 UTC
[maven-verifier] branch MSHARED-885 updated: [MSHARED-885] Adjust
command for wrapper script
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MSHARED-885
in repository https://gitbox.apache.org/repos/asf/maven-verifier.git
The following commit(s) were added to refs/heads/MSHARED-885 by this push:
new ac17955 [MSHARED-885] Adjust command for wrapper script
ac17955 is described below
commit ac17955b70b2aad311f5aecccdd13db5c0adab9f
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun May 3 13:12:03 2020 +0200
[MSHARED-885] Adjust command for wrapper script
---
.../java/org/apache/maven/it/ForkedLauncher.java | 24 ++++++++++++++++++++--
.../org/apache/maven/it/ForkedLauncherTest.java | 2 +-
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/maven/it/ForkedLauncher.java b/src/main/java/org/apache/maven/it/ForkedLauncher.java
index 3607be1..7a12193 100644
--- a/src/main/java/org/apache/maven/it/ForkedLauncher.java
+++ b/src/main/java/org/apache/maven/it/ForkedLauncher.java
@@ -26,6 +26,7 @@ import java.io.Writer;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import java.util.regex.Matcher;
@@ -69,8 +70,20 @@ class ForkedLauncher
if ( wrapper )
{
- String script = "mvnw" + ( debugJvm ? "Debug" : "" );
- executable = new File( script ).getPath();
+ final StringBuilder script = new StringBuilder();
+
+ if ( !isWindows() )
+ {
+ script.append( "./" );
+ }
+
+ script.append( "mvnw" );
+
+ if ( debugJvm )
+ {
+ script.append( "Debug" );
+ }
+ executable = script.toString();
}
else
{
@@ -208,5 +221,12 @@ class ForkedLauncher
return version;
}
+
+ private static boolean isWindows()
+ {
+ String osName = System.getProperty( "os.name" ).toLowerCase( Locale.US );
+
+ return ( osName.indexOf( "windows" ) > -1 );
+ }
}
diff --git a/src/test/java/org/apache/maven/it/ForkedLauncherTest.java b/src/test/java/org/apache/maven/it/ForkedLauncherTest.java
index a3e5467..5ed5e78 100644
--- a/src/test/java/org/apache/maven/it/ForkedLauncherTest.java
+++ b/src/test/java/org/apache/maven/it/ForkedLauncherTest.java
@@ -52,7 +52,7 @@ public class ForkedLauncherTest
launcher = new ForkedLauncher( ".", Collections.<String, String>emptyMap(), false, true );
File logFile = temporaryFolder.newFile( "build.log" );
- assertThat( launcher.run( new String[0], new Properties(), workingDir, logFile ), is( 0 ));
+ assertThat( "exit code", launcher.run( new String[0], new Properties(), workingDir, logFile ), is( 0 ) );
expectFileLine( logFile, "Hello World" );
}