This is an automated email from the ASF dual-hosted git repository. cstamas pushed a commit to branch MASSEMBLY-955 in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
commit a378d9efb7702d9fce98d5b273c76042eee46627 Author: Tamas Cservenak <ta...@cservenak.net> AuthorDate: Sat Jun 11 10:58:30 2022 +0200 [MASSEMBLY-955] Update maven-common-artifact-filters And it fixes the MASSEMBLY-955 issue as well. --- pom.xml | 2 +- .../java/org/apache/maven/plugins/assembly/utils/FilterUtils.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index d2ab0c03..858a935f 100644 --- a/pom.xml +++ b/pom.xml @@ -143,7 +143,7 @@ under the License. <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-common-artifact-filters</artifactId> - <version>3.2.0</version> + <version>3.2.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.maven.shared</groupId> diff --git a/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java b/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java index d2867683..8f0ec549 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java +++ b/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java @@ -33,7 +33,6 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.resolver.filter.AndArtifactFilter; import org.apache.maven.artifact.resolver.filter.ArtifactFilter; import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException; -import org.apache.maven.plugins.assembly.internal.PlexusLoggingHelper; import org.apache.maven.project.MavenProject; import org.apache.maven.shared.artifact.filter.PatternExcludesArtifactFilter; import org.apache.maven.shared.artifact.filter.PatternIncludesArtifactFilter; @@ -91,7 +90,7 @@ public final class FilterUtils { if ( f != null ) { - f.reportMissedCriteria( PlexusLoggingHelper.wrap( logger ) ); + f.reportMissedCriteria( logger ); } } return result; @@ -187,8 +186,8 @@ public final class FilterUtils logger.debug( "Statistics for " + sFilter + "\n" ); } - sFilter.reportMissedCriteria( PlexusLoggingHelper.wrap( logger ) ); - sFilter.reportFilteredArtifacts( PlexusLoggingHelper.wrap( logger ) ); + sFilter.reportMissedCriteria( logger ); + sFilter.reportFilteredArtifacts( logger ); } } }