diff --git a/pom.xml b/pom.xml index 03a973f9..0e2394f0 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ 0.8.10 3.9.0 3.8.5 - 3.2.0 + 3.3.1 3.5.1 2.1.1 4.1.104.Final diff --git a/src/test/java/org/asciidoctor/maven/TestUtils.java b/src/test/java/org/asciidoctor/maven/TestUtils.java index 9216e5cc..f5cda3bb 100644 --- a/src/test/java/org/asciidoctor/maven/TestUtils.java +++ b/src/test/java/org/asciidoctor/maven/TestUtils.java @@ -7,8 +7,9 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.shared.filtering.DefaultMavenFileFilter; import org.apache.maven.shared.filtering.DefaultMavenResourcesFiltering; +import org.apache.maven.shared.filtering.MavenFileFilter; +import org.apache.maven.shared.filtering.MavenResourcesFiltering; import org.asciidoctor.maven.log.LogHandler; -import org.codehaus.plexus.logging.console.ConsoleLogger; import org.mockito.Mockito; import org.sonatype.plexus.build.incremental.BuildContext; import org.sonatype.plexus.build.incremental.DefaultBuildContext; @@ -66,17 +67,8 @@ private static T mockAsciidoctorMojo(Class clazz, Map mav } final BuildContext buildContext = new DefaultBuildContext(); - - final DefaultMavenFileFilter mavenFileFilter = new DefaultMavenFileFilter(); - final ConsoleLogger plexusLogger = new ConsoleLogger(); - mavenFileFilter.enableLogging(plexusLogger); - setVariableValueInObject(mavenFileFilter, "buildContext", buildContext); - - final DefaultMavenResourcesFiltering resourceFilter = new DefaultMavenResourcesFiltering(); - setVariableValueInObject(resourceFilter, "mavenFileFilter", mavenFileFilter); - setVariableValueInObject(resourceFilter, "buildContext", buildContext); - resourceFilter.initialize(); - resourceFilter.enableLogging(plexusLogger); + final MavenFileFilter mavenFileFilter = new DefaultMavenFileFilter(buildContext); + final MavenResourcesFiltering resourceFilter = new DefaultMavenResourcesFiltering(mavenFileFilter, buildContext); final AsciidoctorMojo mojo = (AsciidoctorMojo) clazz.getConstructor(new Class[]{}).newInstance(); setVariableValueInObject(mojo, "log", new SystemStreamLog()); @@ -160,5 +152,4 @@ public static List excludeAll() { return singletonList(new ResourceBuilder().directory(".").excludes("**/**").build()); } } - }