Use Files.createSymbolicLink instead of shelling out

apache · Nov 14, 2024 · e6723b0 · e6723b0
1 parent 68d4eca
commit e6723b0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 59 deletions.
diff --git a/src/it/dangling-symlinks/setup.bsh b/src/it/dangling-symlinks/setup.bsh
@@ -18,6 +18,7 @@
  */
 
 import java.io.*;
+import java.nio.file.*;
 import java.util.*;
 import java.util.jar.*;
 import java.util.regex.*;
@@ -30,17 +31,18 @@ try
     File target = new File( targetDir, "link-target.txt" );
 
     System.out.println( "Creating symlink " + link + " -> " + target );
-    if ( !Utils.createSymlink( target, link ) || !link.exists() )
+    Files.createSymbolicLink( target, link );
+    if ( !link.exists() )
     {
-        System.out.println( "FAILURE, platform does not support symlinks, skipping test." );
+        System.out.println( "Platform does not support symlinks, skipping test." );
     }
 
     System.out.println( "Deleting symlink target " + target );
     target.delete();
 }
-catch( Throwable t )
+catch( Exception ex )
 {
-    t.printStackTrace();
+    ex.printStackTrace();
     return false;
 }
 

diff --git a/src/it/symlink-dont-follow/setup.bsh b/src/it/symlink-dont-follow/setup.bsh
@@ -18,6 +18,7 @@
  */
 
 import java.io.*;
+import java.nio.file.*;
 import java.util.*;
 import java.util.jar.*;
 import java.util.regex.*;
@@ -36,9 +37,10 @@ for ( String[] pair : pairs )
     File target = new File( basedir, pair[0] );
     File link = new File( basedir, pair[1] );
     System.out.println( "Creating symlink " + link + " -> " + target );
-    if ( !Utils.createSymlink( target, link ) || !link.exists() )
+    Files.createSymbolicLink( target, link );
+    if ( !link.exists() )
     {
-        System.out.println( "FAILURE, platform does not support symlinks, skipping test." );
+        System.out.println( "Platform does not support symlinks, skipping test." );
         return;
     }
 }
diff --git a/src/test/java/org/apache/maven/plugins/clean/Utils.java b/src/test/java/org/apache/maven/plugins/clean/Utils.java