Revert "[MSHARED-966] Use NIO to copy files instead of deprecated met…

…hod from m-shared-utils" This reverts commit 7e0adf5
apache · Dec 22, 2021 · a6c95ef · a6c95ef
1 parent 680717c
commit a6c95ef
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 30 deletions.
diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
@@ -20,9 +20,7 @@
  */
 
 import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.LinkOption;
-import java.nio.file.StandardCopyOption;
+import java.io.IOException;
 import java.util.List;
 
 import org.apache.maven.execution.MavenSession;
@@ -105,20 +103,12 @@ public void copyFile( File from, File to, boolean filtering, List<FileUtils.Filt
                 {
                     getLogger().debug( "copy " + from.getPath() + " to " + to.getPath() );
                 }
-                if ( overwrite )
-                {
-                    Files.copy( from.toPath(), to.toPath(), LinkOption.NOFOLLOW_LINKS,
-                            StandardCopyOption.REPLACE_EXISTING );
-                }
-                else
-                {
-                    Files.copy( from.toPath(), to.toPath(), LinkOption.NOFOLLOW_LINKS );
-                }
+                FileUtils.copyFile( from, to, encoding, new FileUtils.FilterWrapper[0], overwrite );
             }
 
             buildContext.refresh( to );
         }
-        catch ( Exception e )
+        catch ( IOException e )
         {
             throw new MavenFilteringException( ( filtering ? "filtering " : "copying " ) + from.getPath() + " to "
                 + to.getPath() + " failed with " + e.getClass().getSimpleName() + ": " + e.getMessage(), e );

diff --git a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
@@ -22,7 +22,6 @@
 import java.io.File;
 import java.io.Reader;
 import java.io.StringReader;
-import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -70,18 +69,7 @@ public void testNotOverwriteFile()
 
         to.setLastModified( System.currentTimeMillis() );
 
-        try
-        {
-            mavenFileFilter.copyFile( from, to, false, null, null );
-        }
-        catch ( MavenFilteringException mfe )
-        {
-            // dest file already exist - overwrite by default false
-            if ( !( mfe.getCause() instanceof FileAlreadyExistsException ) )
-            {
-                fail( mfe.getMessage() );
-            }
-        }
+        mavenFileFilter.copyFile( from, to, false, null, null );
 
         Properties properties = PropertyUtils.loadPropertyFile( to, null );
         assertEquals( "${pom.version}", properties.getProperty( "version" ) );

diff --git a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
@@ -688,10 +688,6 @@ public void testShouldReturnGitIgnoreFiles()
 
         File outputDirectory = new File( getBasedir(), "/target/testGitIgnoreFile" );
 
-        if ( outputDirectory.exists() )
-        {
-            FileUtils.forceDelete( outputDirectory );
-        }
         List<Resource> resources = new ArrayList<>();
         resources.add( new Resource()
         {