[maven] branch MNG-5222 updated: [MNG-5222] Fix logger

[sl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch MNG-5222
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/MNG-5222 by this push:
     new 9c7d095  [MNG-5222] Fix logger
9c7d095 is described below

commit 9c7d0952081f708e2ed0a19814b539bb8fb13dc7
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Oct 10 16:40:29 2021 +0200

    [MNG-5222] Fix logger
---
 .../apache/maven/plugin/internal/DefaultMavenPluginManager.java  | 3 +--
 .../maven/plugin/internal/ValidatingConfigurationListener.java   | 9 ++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
index c3cc65a..49b99a9 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
@@ -616,8 +616,7 @@ public class DefaultMavenPluginManager
             // so that this method could entirely be handled by a plexus lookup?
             configurator = container.lookup( ComponentConfigurator.class, configuratorId );
 
-            ValidatingConfigurationListener validator =
-                new ValidatingConfigurationListener( mojo, mojoDescriptor, logger );
+            ValidatingConfigurationListener validator = new ValidatingConfigurationListener( mojo, mojoDescriptor );
 
             logger.debug(
                 "Configuring mojo '" + mojoDescriptor.getId() + "' with " + configuratorId + " configurator -->" );
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java
index 7745e25..acf329d 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java
@@ -20,7 +20,6 @@ package org.apache.maven.plugin.internal;
  */
 
 import java.lang.reflect.Array;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -30,7 +29,8 @@ import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.Parameter;
 import org.apache.maven.shared.utils.logging.MessageUtils;
 import org.codehaus.plexus.component.configurator.ConfigurationListener;
-import org.codehaus.plexus.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A configuration listener to help validate the plugin configuration. For instance, check for required but missing
@@ -46,15 +46,14 @@ class ValidatingConfigurationListener
 
     private final MojoDescriptor mojoDescriptor;
 
-    private final Logger logger;
+    private final Logger logger = LoggerFactory.getLogger( ValidatingConfigurationListener.class );
 
     private final Map<String, Parameter> missingParameters;
 
-    ValidatingConfigurationListener( Object mojo, MojoDescriptor mojoDescriptor, Logger logger )
+    ValidatingConfigurationListener( Object mojo, MojoDescriptor mojoDescriptor )
     {
         this.mojo = mojo;
         this.mojoDescriptor = mojoDescriptor;
-        this.logger = logger;
         this.missingParameters = new HashMap<>();
 
         if ( mojoDescriptor.getParameters() != null )