diff --git a/pom.xml b/pom.xml index f548340c..5aef5d8a 100644 --- a/pom.xml +++ b/pom.xml @@ -120,13 +120,13 @@ org.codehaus.plexus plexus-utils - 3.0.10 - provided + 3.3.0 + test org.apache.maven.plugin-testing maven-plugin-testing-harness - 3.1.0 + 3.3.0 test 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 map = new HashMap<>(); + final Map 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 ) ); } }