This is an automated email from the ASF dual-hosted git repository. cstamas pushed a commit to branch MASSEMBLY-960-update-maven-filtering in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
commit 5b2d763f5b925d0f46dd52e662af9c5f7bfd5ac1 Author: Tamas Cservenak <ta...@cservenak.net> AuthorDate: Sat Jun 11 11:36:04 2022 +0200 [MASSEMBLY-960] Update maven-filtering Once it is released. --- pom.xml | 2 +- .../org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index d2ab0c03..559ab33b 100644 --- a/pom.xml +++ b/pom.xml @@ -181,7 +181,7 @@ under the License. <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-filtering</artifactId> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> diff --git a/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java b/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java index bc3f7fc9..cc18ed4e 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java @@ -39,7 +39,6 @@ import java.util.Set; import org.apache.commons.io.IOUtils; import org.apache.maven.model.Model; -import org.apache.maven.plugins.assembly.internal.PlexusLoggingHelper; import org.apache.maven.plugins.assembly.testutils.PojoConfigSource; import org.apache.maven.project.MavenProject; import org.apache.maven.shared.filtering.DefaultMavenReaderFilter; @@ -50,7 +49,6 @@ import org.codehaus.plexus.components.io.functions.InputStreamTransformer; import org.codehaus.plexus.components.io.resources.PlexusIoResource; import org.junit.Test; import org.mockito.ArgumentCaptor; -import org.slf4j.LoggerFactory; public class ReaderFormatterTest @@ -158,7 +156,6 @@ public class ReaderFormatterTest final PojoConfigSource cfg = new PojoConfigSource(); cfg.setEncoding( "UTF-8" ); DefaultMavenReaderFilter mavenReaderFilter = new DefaultMavenReaderFilter(); - mavenReaderFilter.enableLogging( PlexusLoggingHelper.wrap( LoggerFactory.getLogger( getClass() ) ) ); cfg.setMavenReaderFilter( mavenReaderFilter ); cfg.setEscapeString( null ); cfg.setMavenProject( createBasicMavenProject() );