[maven-shared-utils] branch master updated: move plexus-utils to scope test (#79)

[elharo]

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

elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git


The following commit(s) were added to refs/heads/master by this push:
     new e6249ce  move plexus-utils to scope test (#79)
e6249ce is described below

commit e6249ce6a57590b73e1e666a83593afb04fd1d0a
Author: Elliotte Rusty Harold <elh...@users.noreply.github.com>
AuthorDate: Sun Feb 14 16:46:10 2021 +0000

    move plexus-utils to scope test (#79)
    
    * move plexus-utils to scope test
    * update plexus-utils
    * fix generics
---
 pom.xml                                                           | 6 +++---
 src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index f548340..5aef5d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,13 +120,13 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.10</version>
-      <scope>provided</scope>
+      <version>3.3.0</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-testing</groupId>
       <artifactId>maven-plugin-testing-harness</artifactId>
-      <version>3.1.0</version>
+      <version>3.3.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java 
b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
index 9fa7c85..c692a38 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
@@ -12,6 +12,7 @@ import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeThat;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.maven.shared.utils.Os;
 import org.apache.maven.shared.utils.testhelpers.FileTestHelper;
 import org.codehaus.plexus.util.InterpolationFilterReader;
@@ -653,9 +654,9 @@ public class FileUtilsTest
         );
     }
 
-    private FileUtils.FilterWrapper[] wrappers( String key, String value )
+    private static FileUtils.FilterWrapper[] wrappers( String key, String 
value )
     {
-        final Map<String, String> map = new HashMap<>();
+        final Map<String, Object> map = new HashMap<>();
         map.put( key, value );
         return new FileUtils.FilterWrapper[]
             {
@@ -688,7 +689,7 @@ public class FileUtilsTest
             assertEquals(
                 "Expected " + file.getPath() + " to contain: " + expected,
                 expected,
-                IOUtil.toString( in )
+                IOUtils.toString( in )
             );
         }
     }