[maven-invoker] branch master updated: [MSHARED-1150] - Add ps1 as detectable file type for PowerShell

[sjaranowski]

This is an automated email from the ASF dual-hosted git repository.

sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-invoker.git


The following commit(s) were added to refs/heads/master by this push:
     new 24550e3  [MSHARED-1150] - Add ps1 as detectable file type for 
PowerShell
24550e3 is described below

commit 24550e3ec538bcfbf06ef685eda4fc39091bf3ed
Author: Filiberto Ramirez <filiberto.y.ramirez....@disney.com>
AuthorDate: Sun Oct 9 14:21:59 2022 -0700

    [MSHARED-1150] - Add ps1 as detectable file type for PowerShell
---
 .../maven/shared/invoker/MavenCommandLineBuilder.java   |  8 +++++++-
 .../shared/invoker/MavenCommandLineBuilderTest.java     | 17 +++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git 
a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java 
b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
index b351d01..8501404 100644
--- a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
+++ b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
@@ -652,7 +652,13 @@ public class MavenCommandLineBuilder
     {
         if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
         {
-            File executableFile = new File( baseDirectory, executable + ".cmd" 
);
+            File executableFile = new File( baseDirectory, executable + ".ps1" 
);
+            if ( executableFile.isFile() )
+            {
+                return executableFile;
+            }
+
+            executableFile = new File( baseDirectory, executable + ".cmd" );
             if ( executableFile.isFile() )
             {
                 return executableFile;
diff --git 
a/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
 
b/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
index 20e747c..7a6c7dc 100644
--- 
a/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
+++ 
b/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
@@ -264,6 +264,23 @@ public class MavenCommandLineBuilderTest
         assertEquals( check.getCanonicalPath(), 
mclb.getMavenExecutable().getCanonicalPath() );
     }
 
+    @Test
+    public void testShouldFindDummyPS1MavenExecutable()
+            throws Exception
+    {
+        File dummyMavenHomeBin = temporaryFolder.newFolder( "invoker-tests", 
"dummy-maven-home", "bin" );
+
+        File check;
+        if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
+        {
+            check = createDummyFile( dummyMavenHomeBin, "mvn.ps1" );
+            mclb.setMavenHome( dummyMavenHomeBin.getParentFile() );
+            mclb.setupMavenExecutable( newRequest() );
+
+            assertEquals( check.getCanonicalPath(), 
mclb.getMavenExecutable().getCanonicalPath() );
+        }
+    }
+
     @Test
     public void testShouldFindDummyMavenExecutableWithMavenHomeFromRequest()
         throws Exception