From e6249ce6a57590b73e1e666a83593afb04fd1d0a Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@users.noreply.github.com>
Date: Sun, 14 Feb 2021 16:46:10 +0000
Subject: [PATCH] move plexus-utils to scope test (#79)

* move plexus-utils to scope test
* update plexus-utils
* fix generics
---
 pom.xml                                                    | 6 +++---
 .../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 f548340c..5aef5d8a 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 9fa7c85e..c692a38a 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.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 void copyFileWithFilteringAndNewerDestinationAndMatchingContent()
         );
     }
 
-    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 @@ private static void assertFileContent( @Nonnull File file, @Nonnull String expec
             assertEquals(
                 "Expected " + file.getPath() + " to contain: " + expected,
                 expected,
-                IOUtil.toString( in )
+                IOUtils.toString( in )
             );
         }
     }