You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2023/03/05 23:28:01 UTC

[maven-dependency-analyzer] 01/01: replace Codehaus Plexus utils with Apache Commons

This is an automated email from the ASF dual-hosted git repository.

elharo pushed a commit to branch ioutil
in repository https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git

commit 846b6c6d181d03eca775dc5ed89d442aa6435a4c
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Mar 5 18:27:48 2023 -0500

    replace Codehaus Plexus utils with Apache Commons
---
 pom.xml                                                          | 8 ++++----
 .../dependency/analyzer/asm/DependencyClassFileVisitor.java      | 4 ++--
 .../shared/dependency/analyzer/DefaultClassAnalyzerTest.java     | 9 ++-------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index d3ce734..0b68502 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,15 +94,15 @@
       <artifactId>asm</artifactId>
       <version>9.3</version>
     </dependency>
-
-
-    <!-- testing support -->
+    
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <version>2.11.0</version>
-      <scope>test</scope>
     </dependency>
+
+
+    <!-- testing support -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java
index f8a1e79..84b341f 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java
@@ -23,8 +23,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Set;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.maven.shared.dependency.analyzer.ClassFileVisitor;
-import org.codehaus.plexus.util.IOUtil;
 import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
@@ -56,7 +56,7 @@ public class DependencyClassFileVisitor
     {
         try
         {
-            byte[] byteCode = IOUtil.toByteArray( in );
+            byte[] byteCode = IOUtils.toByteArray( in );
             ClassReader reader = new ClassReader( byteCode );
 
             final Set<String> constantPoolClassRefs = ConstantPoolParser.getConstantPoolClassReferences( byteCode );
diff --git a/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzerTest.java b/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzerTest.java
index 9bdfdb4..096376d 100644
--- a/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzerTest.java
+++ b/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzerTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.shared.dependency.analyzer;
  * under the License.
  */
 
-import org.codehaus.plexus.util.IOUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -88,15 +87,11 @@ public class DefaultClassAnalyzerTest
     {
         //to reproduce MDEP-143
         // corrupt the jar file by altering its contents
-        FileInputStream fis = new FileInputStream( file.toFile() );
         ByteArrayOutputStream baos = new ByteArrayOutputStream( 100 );
-        IOUtil.copy( fis, baos, 100 );
-        fis.close();
+        Files.copy( file, baos );
         byte[] ba = baos.toByteArray();
         ba[50] = 1;
-        FileOutputStream fos = new FileOutputStream( file.toFile() );
-        IOUtil.copy( ba, fos );
-        fos.close();
+        Files.write( file, ba );
 
         ClassAnalyzer analyzer = new DefaultClassAnalyzer();