remove dependency on file management (#63)

elharo · web-flow · commit 48513c979099 · 2020-07-03T13:51:06.000-04:00
* remove DependencyTestUtils
* remove dependency on file-management
diff --git a/pom.xml b/pom.xml
@@ -99,25 +99,24 @@ under the License.
   </properties>
 
   <dependencyManagement>
-      <dependencies>
-          <dependency>
-              <groupId>org.ow2.asm</groupId>
-              <artifactId>asm</artifactId>
-              <version>8.0.1</version>
-          </dependency>
-      </dependencies>
+    <dependencies>
+      <dependency>
+        <groupId>org.ow2.asm</groupId>
+        <artifactId>asm</artifactId>
+        <version>8.0.1</version>
+      </dependency>
+    </dependencies>
   </dependencyManagement>
 
   <dependencies>
+    <!-- maven -->
     <!-- Remove once deprecated code has been replaced/removed  -->
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-compat</artifactId>
       <version>${mavenVersion}</version>
       <scope>test</scope>
     </dependency>
-  
-    <!-- maven -->
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
@@ -190,11 +189,6 @@ under the License.
       <artifactId>doxia-core</artifactId>
       <version>${doxiaVersion}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-core</artifactId>
-      <version>${doxiaVersion}</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-site-renderer</artifactId>
@@ -212,11 +206,6 @@ under the License.
       <artifactId>plexus-utils</artifactId>
       <version>3.3.0</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>file-management</artifactId>
-      <version>3.0.0</version>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-io</artifactId>
diff --git a/src/test/java/org/apache/maven/plugins/dependency/AbstractDependencyMojoTestCase.java b/src/test/java/org/apache/maven/plugins/dependency/AbstractDependencyMojoTestCase.java
@@ -22,9 +22,9 @@
 import java.io.File;
 import java.io.IOException;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
-import org.apache.maven.plugins.dependency.testUtils.DependencyTestUtils;
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
 
 public abstract class AbstractDependencyMojoTestCase
@@ -48,7 +48,7 @@ protected void setUp( String testDirStr, boolean createFiles, boolean flattenedP
         super.setUp();
         testDir = new File( getBasedir(), "target" + File.separatorChar + "unit-tests" + File.separatorChar + testDirStr
             + File.separatorChar );
-        DependencyTestUtils.removeDirectory( testDir );
+        FileUtils.deleteDirectory( testDir );
         assertFalse( testDir.exists() );
 
         stubFactory = new DependencyArtifactStubFactory( this.testDir, createFiles, flattenedPath );
@@ -60,7 +60,7 @@ protected void tearDown()
         {
             try
             {
-                DependencyTestUtils.removeDirectory( testDir );
+                FileUtils.deleteDirectory( testDir );
             }
             catch ( IOException e )
             {
diff --git a/src/test/java/org/apache/maven/plugins/dependency/testUtils/DependencyTestUtils.java b/src/test/java/org/apache/maven/plugins/dependency/testUtils/DependencyTestUtils.java
diff --git a/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestDestFileFilter.java b/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestDestFileFilter.java
@@ -26,10 +26,10 @@
 
 import junit.framework.TestCase;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
-import org.apache.maven.plugins.dependency.testUtils.DependencyTestUtils;
 import org.apache.maven.plugins.dependency.utils.DependencyUtil;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.plugin.testing.SilentLog;
@@ -55,7 +55,7 @@ protected void setUp()
         super.setUp();
 
         outputFolder = new File( "target/markers/" );
-        DependencyTestUtils.removeDirectory( outputFolder );
+        FileUtils.deleteDirectory( outputFolder );
         assertFalse( outputFolder.exists() );
 
         this.fact = new DependencyArtifactStubFactory( outputFolder, false );
@@ -65,7 +65,7 @@ protected void setUp()
     protected void tearDown()
         throws IOException
     {
-        DependencyTestUtils.removeDirectory( outputFolder );
+        FileUtils.deleteDirectory( outputFolder );
     }
 
     public File createFile( Artifact artifact )
diff --git a/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestMarkerFileFilter.java b/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestMarkerFileFilter.java
@@ -26,10 +26,10 @@
 
 import junit.framework.TestCase;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
-import org.apache.maven.plugins.dependency.testUtils.DependencyTestUtils;
 import org.apache.maven.plugins.dependency.utils.markers.DefaultFileMarkerHandler;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.plugin.testing.SilentLog;
@@ -55,7 +55,7 @@ protected void setUp()
         super.setUp();
 
         outputFolder = new File( "target/markers/" );
-        DependencyTestUtils.removeDirectory( outputFolder );
+        FileUtils.deleteDirectory( outputFolder );
         assertFalse( outputFolder.exists() );
 
         this.fact = new DependencyArtifactStubFactory( outputFolder, false );
@@ -65,7 +65,7 @@ protected void setUp()
     protected void tearDown()
         throws IOException
     {
-        DependencyTestUtils.removeDirectory( outputFolder );
+        FileUtils.deleteDirectory( outputFolder );
     }
 
     public void testMarkerFile()
@@ -99,7 +99,7 @@ public void testMarkerSnapshots()
         result = filter.filter( artifacts );
         assertEquals( 2, result.size() );
         assertTrue( handler.clearMarker() );
-        DependencyTestUtils.removeDirectory( outputFolder );
+        FileUtils.deleteDirectory( outputFolder );
         assertFalse( outputFolder.exists() );
     }
 
@@ -119,7 +119,7 @@ public void testMarkerRelease()
         assertEquals( 2, result.size() );
 
         assertTrue( handler.clearMarker() );
-        DependencyTestUtils.removeDirectory( outputFolder );
+        FileUtils.deleteDirectory( outputFolder );
         assertFalse( outputFolder.exists() );
     }
 
@@ -157,7 +157,7 @@ public void testMarkerTimestamp()
         assertFalse( handler.isMarkerSet() );
         snap.getFile().delete();
         release.getFile().delete();
-        DependencyTestUtils.removeDirectory( outputFolder );
+        FileUtils.deleteDirectory( outputFolder );
         assertFalse( outputFolder.exists() );
     }
 
diff --git a/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestResolveMarkerFileFilter.java b/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestResolveMarkerFileFilter.java
@@ -29,10 +29,10 @@
 
 import junit.framework.TestCase;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
-import org.apache.maven.plugins.dependency.testUtils.DependencyTestUtils;
 import org.apache.maven.plugins.dependency.utils.markers.SourcesFileMarkerHandler;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.plugin.testing.SilentLog;
@@ -58,7 +58,7 @@ protected void setUp()
         super.setUp();
 
         outputFolder = new File( "target/markers/" );
-        DependencyTestUtils.removeDirectory( outputFolder );
+        FileUtils.deleteDirectory( outputFolder );
         assertFalse( outputFolder.exists() );
 
         this.fact = new DependencyArtifactStubFactory( outputFolder, false );
@@ -68,7 +68,7 @@ protected void setUp()
     protected void tearDown()
         throws IOException
     {
-        DependencyTestUtils.removeDirectory( outputFolder );
+        FileUtils.deleteDirectory( outputFolder );
     }
 
     public void testResolveFile()
diff --git a/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestDefaultMarkerFileHandler.java b/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestDefaultMarkerFileHandler.java
@@ -26,13 +26,13 @@
 
 import junit.framework.TestCase;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.DefaultArtifact;
 import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.artifact.handler.DefaultArtifactHandler;
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.dependency.testUtils.DependencyTestUtils;
 import org.apache.maven.plugins.dependency.testUtils.stubs.StubDefaultFileMarkerHandler;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.plugin.testing.SilentLog;
@@ -66,14 +66,14 @@ protected void setUp()
         artifacts.add( artifact );
 
         outputFolder = new File( "target/markers/" );
-        DependencyTestUtils.removeDirectory( this.outputFolder );
+        FileUtils.deleteDirectory( this.outputFolder );
         assertFalse( outputFolder.exists() );
     }
 
     protected void tearDown()
         throws IOException
     {
-        DependencyTestUtils.removeDirectory( this.outputFolder );
+        FileUtils.deleteDirectory( this.outputFolder );
     }
 
     public void testSetMarker()
diff --git a/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestUnpackMarkerFileHandler.java b/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestUnpackMarkerFileHandler.java
@@ -24,11 +24,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.dependency.fromConfiguration.ArtifactItem;
 import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
-import org.apache.maven.plugins.dependency.testUtils.DependencyTestUtils;
 import org.apache.maven.plugins.dependency.testUtils.stubs.StubUnpackFileMarkerHandler;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
@@ -54,7 +54,7 @@ protected void setUp()
 
         testDir = new File( getBasedir(), "target" + File.separatorChar + "unit-tests" + File.separatorChar
             + "unpack-markers" + File.separatorChar );
-        DependencyTestUtils.removeDirectory( testDir );
+        FileUtils.deleteDirectory( testDir );
         assertFalse( testDir.exists() );
 
         stubFactory = new DependencyArtifactStubFactory( this.testDir, false );
@@ -77,14 +77,14 @@ protected void setUp()
         artifactItems.add( artifactItem );
 
         outputFolder = new File( "target/markers/" );
-        DependencyTestUtils.removeDirectory( this.outputFolder );
+        FileUtils.deleteDirectory( this.outputFolder );
         assertFalse( outputFolder.exists() );
     }
 
     protected void tearDown()
         throws IOException
     {
-        DependencyTestUtils.removeDirectory( this.outputFolder );
+        FileUtils.deleteDirectory( this.outputFolder );
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@`
`22`	`22`	`import java.io.File;`
`23`	`23`	`import java.io.IOException;`
`24`	`24`
	`25`	`+import org.apache.commons.io.FileUtils;`
`25`	`26`	`import org.apache.maven.plugin.MojoExecutionException;`
`26`	`27`	`import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;`
`27`		`-import org.apache.maven.plugins.dependency.testUtils.DependencyTestUtils;`
`28`	`28`	`import org.apache.maven.plugin.testing.AbstractMojoTestCase;`
`29`	`29`
`30`	`30`	`public abstract class AbstractDependencyMojoTestCase`
`@@ -48,7 +48,7 @@ protected void setUp( String testDirStr, boolean createFiles, boolean flattenedP`
`48`	`48`	`super.setUp();`
`49`	`49`	`testDir = new File( getBasedir(), "target" + File.separatorChar + "unit-tests" + File.separatorChar + testDirStr`
`50`	`50`	`+ File.separatorChar );`
`51`		`- DependencyTestUtils.removeDirectory( testDir );`
	`51`	`+ FileUtils.deleteDirectory( testDir );`
`52`	`52`	`assertFalse( testDir.exists() );`
`53`	`53`
`54`	`54`	`stubFactory = new DependencyArtifactStubFactory( this.testDir, createFiles, flattenedPath );`
`@@ -60,7 +60,7 @@ protected void tearDown()`
`60`	`60`	`{`
`61`	`61`	`try`
`62`	`62`	`{`
`63`		`- DependencyTestUtils.removeDirectory( testDir );`
	`63`	`+ FileUtils.deleteDirectory( testDir );`
`64`	`64`	`}`
`65`	`65`	`catch ( IOException e )`
`66`	`66`	`{`