Skip to content

Commit bf21c55

Browse files
MCLEAN-110 Replaced Utils.createSymlink with Java 7 Files.createSymbolicLink (#59)
1 parent 9073634 commit bf21c55

File tree

3 files changed

+14
-63
lines changed

3 files changed

+14
-63
lines changed

src/it/dangling-symlinks/setup.bsh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,28 @@
1717
* under the License.
1818
*/
1919

20-
import java.io.*;
20+
import java.nio.file.*;
21+
import java.nio.file.attribute.*;
2122
import java.util.*;
2223
import java.util.jar.*;
2324
import java.util.regex.*;
2425
import org.apache.maven.plugins.clean.*;
2526

2627
try
2728
{
28-
File targetDir = new File( basedir, "target" );
29-
File link = new File( targetDir, "link" );
30-
File target = new File( targetDir, "link-target.txt" );
29+
Path targetDir = basedir.toPath().resolve( "target" );
30+
Path link = targetDir.resolve( "link" );
31+
Path target = targetDir.resolve( "link-target.txt" );
3132

3233
System.out.println( "Creating symlink " + link + " -> " + target );
33-
if ( !Utils.createSymlink( target, link ) || !link.exists() )
34+
Files.createSymbolicLink( link, target, new FileAttribute[0] );
35+
if ( !Files.exists( link, new LinkOption[0] ) )
3436
{
3537
System.out.println( "FAILURE, platform does not support symlinks, skipping test." );
3638
}
3739

3840
System.out.println( "Deleting symlink target " + target );
39-
target.delete();
41+
Files.delete( target );
4042
}
4143
catch( Throwable t )
4244
{

src/it/symlink-dont-follow/setup.bsh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
* under the License.
1818
*/
1919

20-
import java.io.*;
20+
import java.nio.file.*;
21+
import java.nio.file.attribute.*;
2122
import java.util.*;
2223
import java.util.jar.*;
2324
import java.util.regex.*;
@@ -33,10 +34,11 @@ String[][] pairs =
3334

3435
for ( String[] pair : pairs )
3536
{
36-
File target = new File( basedir, pair[0] );
37-
File link = new File( basedir, pair[1] );
37+
Path target = basedir.toPath().resolve( pair[0] );
38+
Path link = basedir.toPath().resolve( pair[1] );
3839
System.out.println( "Creating symlink " + link + " -> " + target );
39-
if ( !Utils.createSymlink( target, link ) || !link.exists() )
40+
Files.createSymbolicLink( link, target, new FileAttribute[0] );
41+
if ( !Files.exists( link, new LinkOption[0] ) )
4042
{
4143
System.out.println( "FAILURE, platform does not support symlinks, skipping test." );
4244
return;

src/test/java/org/apache/maven/plugins/clean/Utils.java

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)