[MNG-7278] Clean up core logging

maven-compat/src/test/java/org/apache/maven/project/TestProjectBuilder.java

@@ -22,7 +22,6 @@
 import org.apache.maven.bridge.MavenRepositorySystem;
 import org.apache.maven.model.building.ModelBuilder;
 import org.apache.maven.model.building.ModelProcessor;
-import org.codehaus.plexus.logging.Logger;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.impl.RemoteRepositoryManager;
 
@@ -37,12 +36,12 @@ public class TestProjectBuilder
 {
     @Inject
     public TestProjectBuilder(
-            Logger logger, ModelBuilder modelBuilder, ModelProcessor modelProcessor,
+            ModelBuilder modelBuilder, ModelProcessor modelProcessor,
             ProjectBuildingHelper projectBuildingHelper, MavenRepositorySystem repositorySystem,
             RepositorySystem repoSystem, RemoteRepositoryManager repositoryManager,
             ProjectDependenciesResolver dependencyResolver )
     {
-        super( logger, modelBuilder, modelProcessor, projectBuildingHelper, repositorySystem, repoSystem,
+        super( modelBuilder, modelProcessor, projectBuildingHelper, repositorySystem, repoSystem,
                 repositoryManager, dependencyResolver );
     }
 

maven-core/src/main/java/org/apache/maven/DefaultMaven.java

@@ -48,11 +48,12 @@
 import org.apache.maven.session.scope.internal.SessionScope;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.logging.Logger;
 import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.repository.WorkspaceReader;
 import org.eclipse.aether.util.repository.ChainedWorkspaceReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -82,8 +83,7 @@
 public class DefaultMaven
     implements Maven
 {
-
-    private final Logger logger;
+    private final Logger logger = LoggerFactory.getLogger( getClass() );
 
     protected ProjectBuilder projectBuilder;
 
@@ -109,7 +109,6 @@ public class DefaultMaven
 
     @Inject
     public DefaultMaven(
-            Logger logger,
             ProjectBuilder projectBuilder,
             LifecycleStarter lifecycleStarter,
             PlexusContainer container,
@@ -122,7 +121,6 @@ public DefaultMaven(
             BuildResumptionDataRepository buildResumptionDataRepository,
             SuperPomProvider superPomProvider )
     {
-        this.logger = logger;
         this.projectBuilder = projectBuilder;
         this.lifecycleStarter = lifecycleStarter;
         this.container = container;

maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java

@@ -45,9 +45,10 @@
 import org.codehaus.plexus.classworlds.ClassWorld;
 import org.codehaus.plexus.classworlds.realm.ClassRealm;
 import org.codehaus.plexus.classworlds.realm.DuplicateRealmException;
-import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.StringUtils;
 import org.eclipse.aether.artifact.Artifact;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Manages the class realms used by Maven. <strong>Warning:</strong> This is an internal utility class that is only
@@ -73,7 +74,7 @@ public class DefaultClassRealmManager
      */
     private static final ClassLoader PARENT_CLASSLOADER = ClassWorld.class.getClassLoader();
 
-    private final Logger logger;
+    private final Logger logger = LoggerFactory.getLogger( getClass() );
 
     private final ClassWorld world;
 
@@ -91,10 +92,10 @@ public class DefaultClassRealmManager
     private final Set<String> providedArtifacts;
 
     @Inject
-    public DefaultClassRealmManager( Logger logger, PlexusContainer container,
-                                     List<ClassRealmManagerDelegate> delegates, CoreExportsProvider exports )
+    public DefaultClassRealmManager( PlexusContainer container,
+                                     List<ClassRealmManagerDelegate> delegates,
+                                     CoreExportsProvider exports )
     {
-        this.logger = logger;
         this.world = ( (MutablePlexusContainer) container ).getClassWorld();
         this.containerRealm = container.getContainerRealm();
         this.delegates = delegates;

maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java

@@ -28,8 +28,9 @@
 
 import org.apache.maven.eventspy.EventSpy;
 import org.apache.maven.execution.ExecutionListener;
-import org.codehaus.plexus.logging.Logger;
 import org.eclipse.aether.RepositoryListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Dispatches callbacks to all registered eventspies.
@@ -39,15 +40,13 @@
 @Singleton
 public class EventSpyDispatcher
 {
-
-    private final Logger logger;
+    private final Logger logger = LoggerFactory.getLogger( getClass() );
 
     private final List<EventSpy> eventSpies;
 
     @Inject
-    public EventSpyDispatcher( Logger logger, List<EventSpy> eventSpies )
+    public EventSpyDispatcher( List<EventSpy> eventSpies )
     {
-        this.logger = logger;
         // make copy to get rid of needless overhead for dynamic lookups
         this.eventSpies = new ArrayList<>( eventSpies );
     }

maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java

@@ -36,7 +36,6 @@
 import org.apache.maven.settings.crypto.SettingsDecrypter;
 import org.apache.maven.settings.crypto.SettingsDecryptionResult;
 import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
-import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.eclipse.aether.ConfigurationProperties;
 import org.eclipse.aether.DefaultRepositorySystemSession;
@@ -57,6 +56,8 @@
 import org.eclipse.aether.util.repository.DefaultProxySelector;
 import org.eclipse.aether.util.repository.SimpleResolutionErrorPolicy;
 import org.eclipse.sisu.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -77,7 +78,7 @@
 @Named
 public class DefaultRepositorySystemSessionFactory
 {
-    private final Logger logger;
+    private final Logger logger = LoggerFactory.getLogger( getClass() );
 
     private final ArtifactHandlerManager artifactHandlerManager;
 
@@ -95,7 +96,6 @@ public class DefaultRepositorySystemSessionFactory
 
     @Inject
     public DefaultRepositorySystemSessionFactory(
-            Logger logger,
             ArtifactHandlerManager artifactHandlerManager,
             RepositorySystem repoSystem,
             @Nullable @Named( "simple" ) LocalRepositoryManagerFactory simpleLocalRepoMgrFactory,
@@ -104,7 +104,6 @@ public DefaultRepositorySystemSessionFactory(
             EventSpyDispatcher eventSpyDispatcher,
             MavenRepositorySystem mavenRepositorySystem )
     {
-        this.logger = logger;
         this.artifactHandlerManager = artifactHandlerManager;
         this.repoSystem = repoSystem;
         this.simpleLocalRepoMgrFactory = simpleLocalRepoMgrFactory;

maven-core/src/main/java/org/apache/maven/internal/aether/LoggingRepositoryListener.java

@@ -21,10 +21,10 @@
 
 import java.io.FileNotFoundException;
 
-import org.codehaus.plexus.logging.Logger;
 import org.eclipse.aether.AbstractRepositoryListener;
 import org.eclipse.aether.RepositoryEvent;
 import org.eclipse.aether.transfer.MetadataNotFoundException;
+import org.slf4j.Logger;
 
 /**
  * @author Benjamin Bentmann

maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java

@@ -19,8 +19,6 @@
  * under the License.
  */
 
-import org.codehaus.plexus.logging.Logger;
-
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -33,6 +31,9 @@
 import javax.inject.Named;
 import javax.inject.Singleton;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * @since 3.0
  * @author Jason van Zyl
@@ -46,26 +47,24 @@ public class DefaultLifecycles
 {
     public static final String[] STANDARD_LIFECYCLES = { "default", "clean", "site", "wrapper" };
 
+    private final Logger logger = LoggerFactory.getLogger( getClass() );
+
     // @Configuration(source="org/apache/maven/lifecycle/lifecycles.xml")
 
     private final Map<String, Lifecycle> lifecyclesMap;
 
-    private final Logger logger;
-
     public DefaultLifecycles()
     {
         this.lifecyclesMap = null;
-        this.logger = null;
     }
 
     @Inject
-    public DefaultLifecycles( Map<String, Lifecycle> lifecyclesMap, Logger logger )
+    public DefaultLifecycles( Map<String, Lifecycle> lifecyclesMap )
     {
         // Must keep the lifecyclesMap as is.
         // During initialization it only contains the default lifecycles.
         // However, extensions might add custom lifecycles later on.
         this.lifecyclesMap = lifecyclesMap;
-        this.logger = logger;
     }
 
     /**

maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java

@@ -40,9 +40,10 @@
 import org.apache.maven.model.PluginExecution;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -67,20 +68,18 @@ public class DefaultLifecyclePluginAnalyzer
     public static final String DEFAULTLIFECYCLEBINDINGS_MODELID = "org.apache.maven:maven-core:"
         + DefaultLifecyclePluginAnalyzer.class.getPackage().getImplementationVersion() + ":default-lifecycle-bindings";
 
+    private final Logger logger = LoggerFactory.getLogger( getClass() );
+
     private final PlexusContainer plexusContainer;
 
     private final DefaultLifecycles defaultLifeCycles;
 
-    private final Logger logger;
-
     @Inject
     public DefaultLifecyclePluginAnalyzer( final PlexusContainer plexusContainer,
-                                           final DefaultLifecycles defaultLifeCycles,
-                                           final Logger logger )
+                                           final DefaultLifecycles defaultLifeCycles )
     {
         this.plexusContainer = requireNonNull( plexusContainer );
         this.defaultLifeCycles = requireNonNull( defaultLifeCycles );
-        this.logger = requireNonNull( logger );
     }
 
     // These methods deal with construction intact Plugin object that look like they come from a standard

maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java

@@ -25,7 +25,6 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
@@ -34,8 +33,9 @@
 import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * <p>
@@ -52,13 +52,7 @@
 @Singleton
 public class LifecycleDebugLogger
 {
-    private final Logger logger;
-
-    @Inject
-    public LifecycleDebugLogger( Logger logger )
-    {
-        this.logger = logger;
-    }
+    private final Logger logger = LoggerFactory.getLogger( getClass() );
 
     public void debug( String s )
     {

maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java

@@ -46,12 +46,13 @@
 import org.apache.maven.project.ProjectDependenciesResolver;
 import org.apache.maven.project.artifact.InvalidDependencyVersionException;
 import org.apache.maven.project.artifact.ProjectArtifactsCache;
-import org.codehaus.plexus.logging.Logger;
 import org.eclipse.aether.graph.Dependency;
 import org.eclipse.aether.graph.DependencyFilter;
 import org.eclipse.aether.graph.DependencyNode;
 import org.eclipse.aether.util.filter.AndDependencyFilter;
 import org.eclipse.aether.util.filter.ScopeDependencyFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * <p>
@@ -66,11 +67,10 @@
 @Named
 public class LifecycleDependencyResolver
 {
+    private final Logger logger = LoggerFactory.getLogger( getClass() );
 
     private final ProjectDependenciesResolver dependenciesResolver;
 
-    private final Logger logger;
-
     private final ProjectArtifactFactory artifactFactory;
 
     private final EventSpyDispatcher eventSpyDispatcher;
@@ -80,13 +80,11 @@ public class LifecycleDependencyResolver
     @Inject
     public LifecycleDependencyResolver(
             ProjectDependenciesResolver dependenciesResolver,
-            Logger logger,
             ProjectArtifactFactory artifactFactory,
             EventSpyDispatcher eventSpyDispatcher,
             ProjectArtifactsCache projectArtifactsCache )
     {
         this.dependenciesResolver = dependenciesResolver;
-        this.logger = logger;
         this.artifactFactory = artifactFactory;
         this.eventSpyDispatcher = eventSpyDispatcher;
         this.projectArtifactsCache = projectArtifactsCache;

maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java

@@ -35,7 +35,8 @@
 import org.apache.maven.lifecycle.internal.builder.Builder;
 import org.apache.maven.lifecycle.internal.builder.BuilderNotFoundException;
 import org.apache.maven.session.scope.internal.SessionScope;
-import org.codehaus.plexus.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Starts the build life cycle
@@ -48,12 +49,12 @@
 @Singleton
 public class LifecycleStarter
 {
+    private final Logger logger = LoggerFactory.getLogger( getClass() );
+
     private final ExecutionEventCatapult eventCatapult;
 
     private final DefaultLifecycles defaultLifeCycles;
 
-    private final Logger logger;
-
     private final BuildListCalculator buildListCalculator;
 
     private final LifecycleDebugLogger lifecycleDebugLogger;
@@ -68,7 +69,6 @@ public class LifecycleStarter
     public LifecycleStarter(
             ExecutionEventCatapult eventCatapult,
             DefaultLifecycles defaultLifeCycles,
-            Logger logger,
             BuildListCalculator buildListCalculator,
             LifecycleDebugLogger lifecycleDebugLogger,
             LifecycleTaskSegmentCalculator lifecycleTaskSegmentCalculator,
@@ -77,7 +77,6 @@ public LifecycleStarter(
     {
         this.eventCatapult = eventCatapult;
         this.defaultLifeCycles = defaultLifeCycles;
-        this.logger = logger;
         this.buildListCalculator = buildListCalculator;
         this.lifecycleDebugLogger = lifecycleDebugLogger;
         this.lifecycleTaskSegmentCalculator = lifecycleTaskSegmentCalculator;