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 2015/03/14 21:41:11 UTC
svn commit: r1666744 - in /maven/shared/trunk/maven-invoker/src:
main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
Author: rfscholte
Date: Sat Mar 14 20:41:11 2015
New Revision: 1666744
URL: http://svn.apache.org/r1666744
Log:
[MSHARED-413] Invoker fails on Windows since Maven-3.3.x
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
Modified: maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java?rev=1666744&r1=1666743&r2=1666744&view=diff
==============================================================================
--- maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java (original)
+++ maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java Sat Mar 14 20:41:11 2015
@@ -573,7 +573,14 @@ public class MavenCommandLineBuilder
}
else if ( Os.isFamily( "windows" ) )
{
- executable = "mvn.bat";
+ if ( new File( mavenHome, "/bin/mvn.cmd" ).exists() )
+ {
+ executable = "mvn.cmd";
+ }
+ else
+ {
+ executable = "mvn.bat";
+ }
}
else
{
Modified: maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java?rev=1666744&r1=1666743&r2=1666744&view=diff
==============================================================================
--- maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java (original)
+++ maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java Sat Mar 14 20:41:11 2015
@@ -1024,20 +1024,9 @@ public class MavenCommandLineBuilderTest
assertArgumentsNotPresent( commandline, bannedArgs );
assertArgumentsPresentInOrder( commandline, goals );
- File mavenFile;
- if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
- {
- mavenFile = new File( mavenDir, "bin/mvn.bat" );
- }
- else
- {
- mavenFile = new File( mavenDir, "bin/mvn" );
- }
-
String executable = commandline.getExecutable();
- System.out.println( "Executable is: " + executable );
- assertTrue( executable.indexOf( mavenFile.getCanonicalPath() ) > -1 );
+ assertTrue( executable.indexOf( new File( mavenDir, "bin/mvn" ).getCanonicalPath() ) > -1 );
assertEquals( projectDir.getCanonicalPath(), commandline.getWorkingDirectory().getCanonicalPath() );
}