Remove dependency on plexus (#63)

* remove unused imports * switch to Apache commons IO
apache · Oct 4, 2023 · 7934b48 · 7934b48
1 parent 2860c8b
commit 7934b48
Show file tree

Hide file tree

Showing 22 changed files with 12 additions and 29 deletions.
diff --git a/pom.xml b/pom.xml
@@ -114,11 +114,6 @@
       <artifactId>maven-archiver</artifactId>
       <version>${mavenArchiverVersion}</version>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>3.4.2</version>
-    </dependency>
     <!-- dependencies to annotations -->
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
@@ -145,6 +140,12 @@
       <version>${mavenVersion}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.14.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/src/it/MJAR-162/verify.bsh b/src/it/MJAR-162/verify.bsh
@@ -21,7 +21,6 @@
 import java.io.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
 
 boolean result = true;
 

diff --git a/src/it/MJAR-183/verify.bsh b/src/it/MJAR-183/verify.bsh
@@ -21,7 +21,6 @@
 import java.io.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
 
 boolean result = true;
 

diff --git a/src/it/MJAR-199-change-classifier/verify.bsh b/src/it/MJAR-199-change-classifier/verify.bsh
@@ -21,7 +21,6 @@
 import java.io.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
 
 boolean result = true;
 

diff --git a/src/it/MJAR-199/verify.bsh b/src/it/MJAR-199/verify.bsh
@@ -21,7 +21,6 @@
 import java.io.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
 
 boolean result = true;
 

diff --git a/src/it/MJAR-228/verify.bsh b/src/it/MJAR-228/verify.bsh
@@ -21,7 +21,6 @@
 import java.io.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
 
 boolean result = true;
 

diff --git a/src/it/MJAR-260-invalid-automatic-module-name/verify.bsh b/src/it/MJAR-260-invalid-automatic-module-name/verify.bsh
@@ -22,7 +22,6 @@ import java.io.*;
 import java.nio.file.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
 
 boolean result = true;
 

diff --git a/src/it/MJAR-260-valid-automatic-module-name/verify.bsh b/src/it/MJAR-260-valid-automatic-module-name/verify.bsh
@@ -21,7 +21,6 @@
 import java.io.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
 
 boolean result = true;
 

diff --git a/src/it/MJAR-30-excludes/verify.groovy b/src/it/MJAR-30-excludes/verify.groovy
@@ -21,7 +21,6 @@
 import java.io.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
 
 boolean result = true;
 

diff --git a/src/it/MJAR-30-fullcontent/verify.groovy b/src/it/MJAR-30-fullcontent/verify.groovy
@@ -21,7 +21,6 @@
 import java.io.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
 
 boolean result = true;
 

diff --git a/src/it/MJAR-30-include/verify.groovy b/src/it/MJAR-30-include/verify.groovy
@@ -21,7 +21,6 @@
 import java.io.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
 
 boolean result = true;
 

diff --git a/src/it/MJAR-60/verify.groovy b/src/it/MJAR-60/verify.groovy
@@ -21,7 +21,7 @@
 import java.io.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
+import org.apache.commons.io.*;
 
 boolean result = true;
 
@@ -51,7 +51,7 @@ try
             // Only compare files
             if ( entry.getName().equals( "META-INF/MANIFEST.MF" ) )
             {
-            	String manifest = IOUtil.toString( jar.getInputStream ( entry ) );
+            	String manifest = IOUtils.toString( jar.getInputStream ( entry ) );
             	int index = manifest.indexOf( "Class-Path: config/" );
             	if ( index <= 0 )
             	{	

diff --git a/src/it/MJAR-80-exclude/verify.groovy b/src/it/MJAR-80-exclude/verify.groovy
@@ -21,7 +21,6 @@
 import java.io.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
 
 boolean result = true;
 

diff --git a/src/it/MJAR-80-fullcontent/verify.groovy b/src/it/MJAR-80-fullcontent/verify.groovy
@@ -21,7 +21,6 @@
 import java.io.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
 
 boolean result = true;
 

diff --git a/src/it/MJAR-80-include/verify.groovy b/src/it/MJAR-80-include/verify.groovy
@@ -21,7 +21,6 @@
 import java.io.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
 
 boolean result = true;
 

diff --git a/src/it/MJAR-82/verify.bsh b/src/it/MJAR-82/verify.bsh
@@ -21,7 +21,6 @@
 import java.io.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
 import org.codehaus.plexus.util.cli.*;
 import org.codehaus.plexus.util.FileUtils;
 

diff --git a/src/it/manifest-content/verify.grovy b/src/it/manifest-content/verify.grovy
@@ -22,7 +22,6 @@ import java.io.*;
 import java.util.*;
 import java.util.jar.*;
 import java.util.zip.*;
-import org.codehaus.plexus.util.*;
 
 boolean result = true;
 

diff --git a/src/it/mjar-139/verify.bsh b/src/it/mjar-139/verify.bsh
@@ -21,7 +21,6 @@
 import java.io.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
 
 boolean result = true;
 

diff --git a/src/it/mjar-71-01/verify.groovy b/src/it/mjar-71-01/verify.groovy
@@ -21,7 +21,7 @@
 import java.io.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
+import org.apache.commons.io.*;
 
 boolean result = true;
 
@@ -51,7 +51,7 @@ try
             // Only compare files
             if ( entry.getName().equals( "META-INF/MANIFEST.MF" ) )
             {
-            	String manifest = IOUtil.toString( jar.getInputStream ( entry ) );
+            	String manifest = IOUtils.toString( jar.getInputStream ( entry ) );
             	int index = manifest.indexOf( "Archiver-Version: foobar-1.23456" );
             	if ( index <= 0 )
             	{	

diff --git a/src/it/mjar-71-02/verify.groovy b/src/it/mjar-71-02/verify.groovy
@@ -21,7 +21,7 @@
 import java.io.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
+import org.apache.commons.io.*;
 
 boolean result = true;
 
@@ -51,7 +51,7 @@ try
             // Only compare files
             if ( entry.getName().equals ( "META-INF/MANIFEST.MF" ) )
             {
-            	String manifest = IOUtil.toString( jar.getInputStream ( entry ) );
+            	String manifest = IOUtils.toString( jar.getInputStream ( entry ) );
             	int index = manifest.indexOf( "Archiver-Version: foobar-1.23456" );
             	if ( index > 0 )
             	{	

diff --git a/src/it/mjar-90/verify.bsh b/src/it/mjar-90/verify.bsh
@@ -21,7 +21,6 @@
 import java.io.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
 
 boolean result = true;
 

diff --git a/src/it/project-004/verify.groovy b/src/it/project-004/verify.groovy
@@ -21,7 +21,6 @@
 import java.io.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
 
 boolean result = true;