From dc08f512784669f24817d9596b63c791520334a3 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Fri, 1 Oct 2021 15:55:29 +0200 Subject: [PATCH 1/8] Clean up core logging We had all kind of Loggers in Core, some Plexus injected, some acquired using SLF4J LoggerFactory, some static, some final, etc. This PR aligns all those uses to SLF4J finals. Notices: * maven-core does NOT use Plexus Logger anymore * did not touch maven-compat --- .../java/org/apache/maven/DefaultMaven.java | 7 +- .../classrealm/DefaultClassRealmManager.java | 11 +- .../eventspy/internal/EventSpyDispatcher.java | 7 +- ...DefaultRepositorySystemSessionFactory.java | 6 +- .../aether/LoggingRepositoryListener.java | 2 +- .../maven/lifecycle/DefaultLifecycles.java | 13 +-- .../DefaultLifecyclePluginAnalyzer.java | 8 +- .../internal/LifecycleDebugLogger.java | 14 +-- .../internal/LifecycleDependencyResolver.java | 10 +- .../lifecycle/internal/LifecycleStarter.java | 8 +- .../internal/MojoDescriptorCreator.java | 7 +- .../internal/builder/BuilderCommon.java | 12 +- .../multithreaded/MultiThreadedBuilder.java | 7 +- .../plugin/DebugConfigurationListener.java | 4 +- .../PluginParameterExpressionEvaluator.java | 3 +- .../internal/DefaultMavenPluginManager.java | 12 +- .../DefaultPluginDependenciesResolver.java | 7 +- .../internal/DefaultPluginPrefixResolver.java | 7 +- .../DefaultPluginVersionResolver.java | 7 +- .../maven/project/DefaultProjectBuilder.java | 7 +- .../project/DefaultProjectBuildingHelper.java | 7 +- .../DefaultProjectDependenciesResolver.java | 7 +- .../project/artifact/MavenMetadataSource.java | 8 +- .../internal/DefaultRuntimeInformation.java | 8 +- .../maven/toolchain/DefaultToolchain.java | 6 +- .../toolchain/DefaultToolchainManager.java | 22 +++- .../DefaultToolchainManagerPrivate.java | 17 +++ .../toolchain/DefaultToolchainsBuilder.java | 8 +- .../toolchain/java/DefaultJavaToolChain.java | 2 +- .../toolchain/java/JavaToolchainFactory.java | 8 +- .../toolchain/java/JavaToolchainImpl.java | 2 +- .../lifecycle/DefaultLifecyclesTest.java | 3 +- .../lifecycle/internal/BuilderCommonTest.java | 15 ++- .../internal/stub/DefaultLifecyclesStub.java | 2 +- .../lifecycle/internal/stub/LoggerStub.java | 110 ------------------ .../DefaultToolchainManagerPrivateTest.java | 22 +--- .../DefaultToolchainManagerTest.java | 24 +--- .../maven/toolchain/DefaultToolchainTest.java | 7 +- .../BootstrapCoreExtensionManager.java | 8 +- maven-plugin-api/pom.xml | 4 + .../maven/monitor/logging/DefaultLog.java | 2 +- 41 files changed, 160 insertions(+), 291 deletions(-) delete mode 100644 maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LoggerStub.java diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java index f80833b2e386..39798a81a11b 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/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,9 +83,7 @@ public class DefaultMaven implements Maven { - - @Inject - private Logger logger; + private final Logger logger = LoggerFactory.getLogger( getClass() ); @Inject protected ProjectBuilder projectBuilder; diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java index cf3d746f889d..abd4bb63b582 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java +++ b/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. Warning: 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 providedArtifacts; @Inject - public DefaultClassRealmManager( Logger logger, PlexusContainer container, - List delegates, CoreExportsProvider exports ) + public DefaultClassRealmManager( PlexusContainer container, + List delegates, + CoreExportsProvider exports ) { - this.logger = logger; this.world = ( (MutablePlexusContainer) container ).getClassWorld(); this.containerRealm = container.getContainerRealm(); this.delegates = delegates; diff --git a/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java b/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java index 980bc153a297..3fb3432f59d6 100644 --- a/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java +++ b/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,9 +40,7 @@ @Singleton public class EventSpyDispatcher { - - @Inject - private Logger logger; + private final Logger logger = LoggerFactory.getLogger( getClass() ); private List eventSpies; diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java index c419f1714637..9a2d0bb3e010 100644 --- a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java +++ b/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,8 +78,7 @@ @Named public class DefaultRepositorySystemSessionFactory { - @Inject - private Logger logger; + private final Logger logger = LoggerFactory.getLogger( getClass() ); @Inject private ArtifactHandlerManager artifactHandlerManager; diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/LoggingRepositoryListener.java b/maven-core/src/main/java/org/apache/maven/internal/aether/LoggingRepositoryListener.java index ba8c657a4dc9..340a3b6e3a59 100644 --- a/maven-core/src/main/java/org/apache/maven/internal/aether/LoggingRepositoryListener.java +++ b/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 diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java index 16b2b8c9740f..1160e88a8d5b 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java +++ b/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 lifecyclesMap; - private final Logger logger; - public DefaultLifecycles() { this.lifecyclesMap = null; - this.logger = null; } @Inject - public DefaultLifecycles( Map lifecyclesMap, Logger logger ) + public DefaultLifecycles( Map 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; } /** diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java index f1bb442e242e..823d08c9d2ec 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java @@ -39,9 +39,10 @@ import org.apache.maven.model.PluginExecution; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; -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; /** * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. @@ -59,15 +60,14 @@ 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() ); + @Requirement( role = LifecycleMapping.class ) private Map lifecycleMappings; @Requirement private DefaultLifecycles defaultLifeCycles; - @Requirement - private Logger logger; - public DefaultLifecyclePluginAnalyzer() { } diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java index 9ffb3d4441aa..7dda3b4b77b1 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java +++ b/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; /** *

@@ -52,20 +52,12 @@ @Singleton public class LifecycleDebugLogger { - @Inject - private Logger logger; - + private final Logger logger = LoggerFactory.getLogger( getClass() ); public LifecycleDebugLogger() { } - public LifecycleDebugLogger( Logger logger ) - { - this.logger = logger; - } - - public void debug( String s ) { logger.debug( s ); diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java index 44d6cef95c76..00d3bd28be8d 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java +++ b/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; /** *

@@ -66,13 +67,11 @@ @Named public class LifecycleDependencyResolver { + private final Logger logger = LoggerFactory.getLogger( getClass() ); @Inject private ProjectDependenciesResolver dependenciesResolver; - @Inject - private Logger logger; - @Inject private ProjectArtifactFactory artifactFactory; @@ -86,10 +85,9 @@ public LifecycleDependencyResolver() { } - public LifecycleDependencyResolver( ProjectDependenciesResolver projectDependenciesResolver, Logger logger ) + public LifecycleDependencyResolver( ProjectDependenciesResolver projectDependenciesResolver ) { this.dependenciesResolver = projectDependenciesResolver; - this.logger = logger; } public static List getProjects( MavenProject project, MavenSession session, boolean aggregator ) diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java index e3d886d283bf..56b2290c1548 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java +++ b/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,15 +49,14 @@ @Singleton public class LifecycleStarter { + private final Logger logger = LoggerFactory.getLogger( getClass() ); + @Inject private ExecutionEventCatapult eventCatapult; @Inject private DefaultLifecycles defaultLifeCycles; - @Inject - private Logger logger; - @Inject private BuildListCalculator buildListCalculator; diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java index 03eae374e069..7f7a7bf99e37 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java @@ -47,8 +47,9 @@ import org.apache.maven.plugin.version.PluginVersionResolver; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.util.xml.Xpp3Dom; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

@@ -66,9 +67,7 @@ @Singleton public class MojoDescriptorCreator { - - @Inject - private Logger logger; + private final Logger logger = LoggerFactory.getLogger( getClass() ); @Inject private PluginVersionResolver pluginVersionResolver; diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java index d16b27d3132b..86d49f58e2ea 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java @@ -57,7 +57,8 @@ import org.apache.maven.plugin.version.PluginVersionResolutionException; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.logging.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Common code that is shared by the LifecycleModuleBuilder and the LifeCycleWeaveBuilder @@ -71,6 +72,8 @@ @Singleton public class BuilderCommon { + private final Logger logger; + @Inject private LifecycleDebugLogger lifecycleDebugLogger; @@ -80,15 +83,14 @@ public class BuilderCommon @Inject private ExecutionEventCatapult eventCatapult; - @Inject - private Logger logger; - public BuilderCommon() { + this.logger = LoggerFactory.getLogger( getClass() ); } public BuilderCommon( LifecycleDebugLogger lifecycleDebugLogger, - LifecycleExecutionPlanCalculator lifeCycleExecutionPlanCalculator, Logger logger ) + LifecycleExecutionPlanCalculator lifeCycleExecutionPlanCalculator, + Logger logger ) { this.lifecycleDebugLogger = lifecycleDebugLogger; this.lifeCycleExecutionPlanCalculator = lifeCycleExecutionPlanCalculator; diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java index 285217f858bb..7a94adef5508 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java @@ -43,7 +43,8 @@ import org.apache.maven.lifecycle.internal.TaskSegment; import org.apache.maven.lifecycle.internal.builder.Builder; import org.apache.maven.project.MavenProject; -import org.codehaus.plexus.logging.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Builds the full lifecycle in weave-mode (phase by phase as opposed to project-by-project). @@ -64,9 +65,7 @@ public class MultiThreadedBuilder implements Builder { - - @Inject - private Logger logger; + private final Logger logger = LoggerFactory.getLogger( getClass() ); @Inject private LifecycleModuleBuilder lifecycleModuleBuilder; diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java b/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java index 0ce3ae258adc..2ad629fc582b 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java @@ -22,7 +22,7 @@ import java.lang.reflect.Array; import org.codehaus.plexus.component.configurator.ConfigurationListener; -import org.codehaus.plexus.logging.Logger; +import org.slf4j.Logger; /** * Log at debug level the mojo configuration. @@ -33,7 +33,7 @@ public class DebugConfigurationListener implements ConfigurationListener { - private Logger logger; + private final Logger logger; public DebugConfigurationListener( Logger logger ) { diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java index 4f5503382313..2d4aaf8d0365 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java @@ -29,7 +29,6 @@ import org.apache.maven.project.path.PathTranslator; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; import org.codehaus.plexus.component.configurator.expression.TypeAwareExpressionEvaluator; -import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.util.introspection.ReflectionValueExtractor; /** @@ -87,7 +86,7 @@ public class PluginParameterExpressionEvaluator @Deprecated //TODO used by the Enforcer plugin public PluginParameterExpressionEvaluator( MavenSession session, MojoExecution mojoExecution, - PathTranslator pathTranslator, Logger logger, MavenProject project, + PathTranslator pathTranslator, MavenProject project, Properties properties ) { this( session, mojoExecution ); 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 7bb19bb0d94c..9e3fdd752f94 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 @@ -73,8 +73,6 @@ import org.codehaus.plexus.configuration.PlexusConfiguration; import org.codehaus.plexus.configuration.PlexusConfigurationException; import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; -import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.logging.LoggerManager; import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.Xpp3Dom; @@ -84,6 +82,8 @@ import org.eclipse.aether.repository.RemoteRepository; import org.eclipse.aether.util.filter.AndDependencyFilter; import org.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; @@ -132,11 +132,7 @@ public class DefaultMavenPluginManager */ public static final String KEY_EXTENSIONS_REALMS = DefaultMavenPluginManager.class.getName() + "/extensionsRealms"; - @Inject - private Logger logger; - - @Inject - private LoggerManager loggerManager; + private final Logger logger = LoggerFactory.getLogger( getClass() ); @Inject private PlexusContainer container; @@ -571,7 +567,7 @@ else if ( cause instanceof LinkageError ) if ( mojo instanceof Mojo ) { - Logger mojoLogger = loggerManager.getLoggerForComponent( mojoDescriptor.getImplementation() ); + Logger mojoLogger = LoggerFactory.getLogger( mojoDescriptor.getImplementation() ); ( (Mojo) mojo ).setLog( new DefaultLog( mojoLogger ) ); } diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java index 709bd7218264..c8ab6c2cb11c 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java @@ -33,7 +33,6 @@ import org.apache.maven.model.Dependency; import org.apache.maven.model.Plugin; import org.apache.maven.plugin.PluginResolutionException; -import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.util.StringUtils; import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.RepositorySystem; @@ -61,6 +60,8 @@ import org.eclipse.aether.util.graph.manager.DependencyManagerUtils; import org.eclipse.aether.util.graph.selector.AndDependencySelector; import org.eclipse.aether.util.repository.SimpleArtifactDescriptorPolicy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Assists in resolving the dependencies of a plugin. Warning: This is an internal utility class that @@ -75,11 +76,9 @@ public class DefaultPluginDependenciesResolver implements PluginDependenciesResolver { - private static final String REPOSITORY_CONTEXT = "plugin"; - @Inject - private Logger logger; + private final Logger logger = LoggerFactory.getLogger( getClass() ); @Inject private RepositorySystem repoSystem; diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java index 7b98e80fc08a..7b258d76e394 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java @@ -39,7 +39,6 @@ import org.apache.maven.plugin.prefix.PluginPrefixRequest; import org.apache.maven.plugin.prefix.PluginPrefixResolver; import org.apache.maven.plugin.prefix.PluginPrefixResult; -import org.codehaus.plexus.logging.Logger; import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.RepositoryEvent; import org.eclipse.aether.RepositoryEvent.EventType; @@ -53,6 +52,8 @@ import org.eclipse.aether.repository.RepositoryPolicy; import org.eclipse.aether.resolution.MetadataRequest; import org.eclipse.aether.resolution.MetadataResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Resolves a plugin prefix. @@ -65,11 +66,9 @@ public class DefaultPluginPrefixResolver implements PluginPrefixResolver { - private static final String REPOSITORY_CONTEXT = "plugin"; - @Inject - private Logger logger; + private final Logger logger = LoggerFactory.getLogger( getClass() ); @Inject private BuildPluginManager pluginManager; diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java index ec72f2ad5a2c..f88a17894abb 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java @@ -46,7 +46,6 @@ import org.apache.maven.plugin.version.PluginVersionResolutionException; import org.apache.maven.plugin.version.PluginVersionResolver; import org.apache.maven.plugin.version.PluginVersionResult; -import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.util.StringUtils; import org.eclipse.aether.RepositoryEvent; import org.eclipse.aether.RepositoryEvent.EventType; @@ -64,6 +63,8 @@ import org.eclipse.aether.version.InvalidVersionSpecificationException; import org.eclipse.aether.version.Version; import org.eclipse.aether.version.VersionScheme; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Resolves a version for a plugin. @@ -76,13 +77,11 @@ public class DefaultPluginVersionResolver implements PluginVersionResolver { - private static final String REPOSITORY_CONTEXT = "plugin"; private static final Object CACHE_KEY = new Object(); - @Inject - private Logger logger; + private final Logger logger = LoggerFactory.getLogger( getClass() ); @Inject private RepositorySystem repositorySystem; diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java index 3aaf8eeb93a1..32ad3a7de5c2 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java @@ -72,7 +72,6 @@ import org.apache.maven.model.resolution.ModelResolver; import org.apache.maven.repository.internal.ArtifactDescriptorUtils; import org.apache.maven.repository.internal.DefaultModelCache; -import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.util.Os; import org.codehaus.plexus.util.StringUtils; import org.eclipse.aether.RepositorySystemSession; @@ -83,6 +82,8 @@ import org.eclipse.aether.repository.WorkspaceRepository; import org.eclipse.aether.resolution.ArtifactRequest; import org.eclipse.aether.resolution.ArtifactResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * DefaultProjectBuilder @@ -92,9 +93,7 @@ public class DefaultProjectBuilder implements ProjectBuilder { - - @Inject - private Logger logger; + private final Logger logger = LoggerFactory.getLogger( getClass() ); @Inject private ModelBuilder modelBuilder; diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java index e5c89e6f1a70..d96adf387d70 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java @@ -51,9 +51,10 @@ import org.apache.maven.repository.RepositorySystem; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.logging.Logger; import org.eclipse.aether.graph.DependencyFilter; import org.eclipse.aether.util.filter.ExclusionsDependencyFilter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Assists the project builder. Warning: This is an internal utility class that is only public for @@ -67,9 +68,7 @@ public class DefaultProjectBuildingHelper implements ProjectBuildingHelper { - - @Inject - private Logger logger; + private final Logger logger = LoggerFactory.getLogger( getClass() ); @Inject private PlexusContainer container; diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java index 267dc2d0b704..127d37f6895b 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java @@ -34,7 +34,6 @@ import org.apache.maven.model.Dependency; import org.apache.maven.model.DependencyManagement; import org.apache.maven.model.Exclusion; -import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.util.StringUtils; import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.RepositorySystem; @@ -52,6 +51,8 @@ import org.eclipse.aether.util.artifact.ArtifactIdUtils; import org.eclipse.aether.util.artifact.JavaScopes; import org.eclipse.aether.util.graph.manager.DependencyManagerUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author Benjamin Bentmann @@ -61,9 +62,7 @@ public class DefaultProjectDependenciesResolver implements ProjectDependenciesResolver { - - @Inject - private Logger logger; + private final Logger logger = LoggerFactory.getLogger( getClass() ); @Inject private RepositorySystem repoSystem; diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java index 271e6d656cd4..08ba74189682 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java @@ -80,11 +80,12 @@ import org.apache.maven.repository.legacy.metadata.MetadataResolutionRequest; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.codehaus.plexus.logging.Logger; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.repository.RepositoryPolicy; import org.eclipse.aether.repository.WorkspaceReader; import org.eclipse.aether.transfer.ArtifactNotFoundException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author Jason van Zyl @@ -94,6 +95,8 @@ public class MavenMetadataSource implements ArtifactMetadataSource { + private final Logger logger = LoggerFactory.getLogger( getClass() ); + @Inject private RepositoryMetadataManager repositoryMetadataManager; @@ -107,9 +110,6 @@ public class MavenMetadataSource @Inject private PlexusContainer container; - @Inject - private Logger logger; - @Inject private MavenMetadataCache cache; diff --git a/maven-core/src/main/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformation.java b/maven-core/src/main/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformation.java index fbb817e699d2..1fbfb519abcb 100644 --- a/maven-core/src/main/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformation.java +++ b/maven-core/src/main/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformation.java @@ -22,18 +22,18 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; import org.apache.maven.rtinfo.RuntimeInformation; -import org.codehaus.plexus.logging.Logger; import org.eclipse.aether.util.version.GenericVersionScheme; import org.eclipse.aether.version.InvalidVersionSpecificationException; import org.eclipse.aether.version.Version; import org.eclipse.aether.version.VersionConstraint; import org.eclipse.aether.version.VersionScheme; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.InputStream; import java.util.Properties; -import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; @@ -45,9 +45,7 @@ public class DefaultRuntimeInformation implements RuntimeInformation { - - @Inject - private Logger logger; + private final Logger logger = LoggerFactory.getLogger( getClass() ); private String mavenVersion; diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java index 0eb88d7538fc..8b44552b1414 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java @@ -26,7 +26,7 @@ import java.util.Objects; import org.apache.maven.toolchain.model.ToolchainModel; -import org.codehaus.plexus.logging.Logger; +import org.slf4j.Logger; /** * Default abstract toolchain implementation, to be used as base class for any toolchain implementation @@ -38,6 +38,7 @@ public abstract class DefaultToolchain // should have been AbstractToolchain... implements Toolchain, ToolchainPrivate { + private final Logger logger; private String type; @@ -47,8 +48,6 @@ public abstract class DefaultToolchain // should have been AbstractToolchain... private ToolchainModel model; - private Logger logger; - /** * * @param model the model, must not be {@code null} @@ -57,7 +56,6 @@ public abstract class DefaultToolchain // should have been AbstractToolchain... protected DefaultToolchain( ToolchainModel model, Logger logger ) { this.model = model; - this.logger = logger; } diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java index cfe22cb2120b..8f9b42dc5e2e 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java @@ -33,7 +33,10 @@ import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.project.MavenProject; import org.apache.maven.toolchain.model.ToolchainModel; -import org.codehaus.plexus.logging.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static java.util.Objects.requireNonNull; /** * @author mkleint @@ -43,12 +46,25 @@ public class DefaultToolchainManager implements ToolchainManager { - @Inject - Logger logger; + protected final Logger logger; @Inject Map factories; + @Inject + public DefaultToolchainManager() + { + this( LoggerFactory.getLogger( DefaultToolchainManager.class ) ); + } + + /** + * Ctor for UT. + */ + public DefaultToolchainManager( Logger logger ) + { + this.logger = requireNonNull( logger ); + } + @Override public Toolchain getToolchainFromBuildContext( String type, MavenSession session ) { diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java index 538c99d23535..f3b6acdd4fc3 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java @@ -23,13 +23,17 @@ import java.util.List; import java.util.Map; +import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; import org.apache.maven.execution.MavenSession; import org.apache.maven.toolchain.model.ToolchainModel; +import org.slf4j.Logger; /** + * TODO: refactor this, component extending component is bad practice. + * * @author mkleint * @author Robert Scholte */ @@ -39,6 +43,19 @@ public class DefaultToolchainManagerPrivate extends DefaultToolchainManager implements ToolchainManagerPrivate { + @Inject + public DefaultToolchainManagerPrivate() + { + super(); + } + + /** + * Ctor for UT. + */ + public DefaultToolchainManagerPrivate( Logger logger ) + { + super( logger ); + } @Override public ToolchainPrivate[] getToolchainsForType( String type, MavenSession context ) diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java index 94f3114a094d..84a31e4af58b 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java @@ -21,13 +21,13 @@ import org.apache.maven.toolchain.model.PersistedToolchains; import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader; -import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.util.ReaderFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.io.Reader; -import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; @@ -41,9 +41,7 @@ public class DefaultToolchainsBuilder implements ToolchainsBuilder { - - @Inject - private Logger logger; + private final Logger logger = LoggerFactory.getLogger( getClass() ); public PersistedToolchains build( File userToolchainsFile ) throws MisconfiguredToolchainException diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java index ac29f1f6d682..e264e601fde0 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java @@ -20,7 +20,7 @@ */ import org.apache.maven.toolchain.model.ToolchainModel; -import org.codehaus.plexus.logging.Logger; +import org.slf4j.Logger; /** * Provides backwards compatibility with Maven 3.2.3 and earlier. Clients that do not require compatibility with Maven diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java index f2e45a3326af..71d0a0206927 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.Properties; -import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; @@ -33,9 +32,10 @@ import org.apache.maven.toolchain.ToolchainFactory; import org.apache.maven.toolchain.ToolchainPrivate; import org.apache.maven.toolchain.model.ToolchainModel; -import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.xml.Xpp3Dom; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * JDK toolchain factory. @@ -50,9 +50,7 @@ public class JavaToolchainFactory implements ToolchainFactory { - - @Inject - private Logger logger; + private final Logger logger = LoggerFactory.getLogger( getClass() ); public ToolchainPrivate createToolchain( ToolchainModel model ) throws MisconfiguredToolchainException diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java index d047e7e04f0d..af5a88cc42ef 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java @@ -23,9 +23,9 @@ import org.apache.maven.toolchain.DefaultToolchain; import org.apache.maven.toolchain.model.ToolchainModel; -import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.Os; +import org.slf4j.Logger; /** * JDK toolchain implementation. diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java index 81dfb7140453..59229d442b1e 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java @@ -91,8 +91,7 @@ public void testCustomLifecycle() myLifecycles.addAll( defaultLifeCycles.getLifeCycles() ); DefaultLifecycles dl = new DefaultLifecycles( myLifecycles.stream() - .collect( Collectors.toMap( l -> l.getId(), l -> l ) ), - null ); + .collect( Collectors.toMap( l -> l.getId(), l -> l ) ) ); assertThat( dl.getLifeCycles().get( 0 ).getId(), is( "default" ) ); assertThat( dl.getLifeCycles().get( 1 ).getId(), is( "clean" ) ); diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java index fe0776e90ac5..7a4fb893d57f 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java @@ -22,8 +22,8 @@ import org.apache.maven.lifecycle.internal.builder.BuilderCommon; import org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub; import org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub; -import org.codehaus.plexus.logging.Logger; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; @@ -34,7 +34,7 @@ */ public class BuilderCommonTest { - private Logger logger = mock( Logger.class ); + private Logger logger = mock(Logger.class); @Test public void testResolveBuildPlan() @@ -46,7 +46,7 @@ public void testResolveBuildPlan() final MavenSession session1 = original.clone(); session1.setCurrentProject( ProjectDependencyGraphStub.A ); - final BuilderCommon builderCommon = getBuilderCommon(); + final BuilderCommon builderCommon = getBuilderCommon( logger ); final MavenExecutionPlan plan = builderCommon.resolveBuildPlan( session1, ProjectDependencyGraphStub.A, taskSegment1, new HashSet<>() ); @@ -63,7 +63,7 @@ public void testDefaultBindingPluginsWarning() final MavenSession session1 = original.clone(); session1.setCurrentProject( ProjectDependencyGraphStub.A ); - getBuilderCommon().resolveBuildPlan( session1, ProjectDependencyGraphStub.A, taskSegment1, new HashSet<>() ); + getBuilderCommon( logger ).resolveBuildPlan( session1, ProjectDependencyGraphStub.A, taskSegment1, new HashSet<>() ); verify( logger ).warn("Version not locked for default bindings plugins [" + "stub-plugin-initialize, " @@ -95,11 +95,10 @@ public void testGetKey() { } - public BuilderCommon getBuilderCommon() + public BuilderCommon getBuilderCommon( Logger logger ) { - final LifecycleDebugLogger debugLogger = new LifecycleDebugLogger( logger ); - return new BuilderCommon( debugLogger, new LifecycleExecutionPlanCalculatorStub(), - logger ); + final LifecycleDebugLogger debugLogger = new LifecycleDebugLogger(); + return new BuilderCommon( debugLogger, new LifecycleExecutionPlanCalculatorStub(), logger ); } } diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java index 14c67430723a..1d3f8fd5d902 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java @@ -58,7 +58,7 @@ public static DefaultLifecycles createDefaultLifecycles() lifeCycles.put( s, lifecycle ); } - return new DefaultLifecycles( lifeCycles, new LoggerStub() ); + return new DefaultLifecycles( lifeCycles ); } } \ No newline at end of file diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LoggerStub.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LoggerStub.java deleted file mode 100644 index 00bb3cfa9fe0..000000000000 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LoggerStub.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for additional information regarding - * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. You may obtain a - * copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ - -package org.apache.maven.lifecycle.internal.stub; - -import org.codehaus.plexus.logging.Logger; - -/** - * @author Kristian Rosenvold - */ -public class LoggerStub - implements Logger -{ - public void debug( String s ) - { - } - - public void debug( String s, Throwable throwable ) - { - } - - public boolean isDebugEnabled() - { - return true; - } - - public void info( String s ) - { - } - - public void info( String s, Throwable throwable ) - { - } - - public boolean isInfoEnabled() - { - return true; - } - - public void warn( String s ) - { - } - - public void warn( String s, Throwable throwable ) - { - } - - public boolean isWarnEnabled() - { - return true; - } - - public void error( String s ) - { - } - - public void error( String s, Throwable throwable ) - { - } - - public boolean isErrorEnabled() - { - return true; - } - - public void fatalError( String s ) - { - } - - public void fatalError( String s, Throwable throwable ) - { - } - - public boolean isFatalErrorEnabled() - { - return true; - } - - public Logger getChildLogger( String s ) - { - return null; - } - - public int getThreshold() - { - return 0; - } - - public void setThreshold( int i ) - { - - } - - public String getName() - { - return "StubLogger"; - } -} diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java index 523645f187ef..0c0d6d955e00 100644 --- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java +++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java @@ -35,35 +35,23 @@ import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenSession; import org.apache.maven.toolchain.model.ToolchainModel; -import org.codehaus.plexus.logging.Logger; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; +import org.slf4j.Logger; public class DefaultToolchainManagerPrivateTest { - // Mocks to inject into toolchainManager - @Mock - private Logger logger; + private final org.slf4j.Logger logger = mock(Logger.class); - @InjectMocks - private DefaultToolchainManagerPrivate toolchainManager; + private final ToolchainFactory toolchainFactory_basicType = mock(ToolchainFactory.class); - @Mock - private ToolchainFactory toolchainFactory_basicType; + private final ToolchainFactory toolchainFactory_rareType = mock(ToolchainFactory.class); - @Mock - private ToolchainFactory toolchainFactory_rareType; + private final DefaultToolchainManagerPrivate toolchainManager = new DefaultToolchainManagerPrivate( logger ); @BeforeEach public void setUp() { - toolchainManager = new DefaultToolchainManagerPrivate(); - - MockitoAnnotations.initMocks( this ); - toolchainManager.factories = new HashMap<>(); toolchainManager.factories.put( "basic", toolchainFactory_basicType ); toolchainManager.factories.put( "rare", toolchainFactory_rareType ); diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java index c5b808ffa8d9..3151fcfd45c9 100644 --- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java +++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java @@ -35,36 +35,24 @@ import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenSession; import org.apache.maven.toolchain.model.ToolchainModel; -import org.codehaus.plexus.logging.Logger; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; +import org.slf4j.Logger; public class DefaultToolchainManagerTest { - // Mocks to inject into toolchainManager - @Mock - private Logger logger; + private final Logger logger = mock(Logger.class); - @InjectMocks - private DefaultToolchainManager toolchainManager; + private final ToolchainFactory toolchainFactory_basicType = mock(ToolchainFactory.class); - @Mock - private ToolchainFactory toolchainFactory_basicType; + private final ToolchainFactory toolchainFactory_rareType = mock(ToolchainFactory.class); - @Mock - private ToolchainFactory toolchainFactory_rareType; + private final DefaultToolchainManager toolchainManager = new DefaultToolchainManager( logger ); @BeforeEach - public void onSetup() throws Exception + public void onSetup() { - toolchainManager = new DefaultToolchainManager(); - - MockitoAnnotations.initMocks( this ); - toolchainManager.factories = new HashMap<>(); toolchainManager.factories.put( "basic", toolchainFactory_basicType ); toolchainManager.factories.put( "rare", toolchainFactory_rareType ); diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java index a5d14b29f723..f4d39c5701fd 100644 --- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java +++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java @@ -22,6 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import java.io.InputStream; @@ -31,16 +32,14 @@ import org.apache.maven.toolchain.model.PersistedToolchains; import org.apache.maven.toolchain.model.ToolchainModel; import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader; -import org.codehaus.plexus.logging.Logger; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.slf4j.Logger; public class DefaultToolchainTest { - @Mock - private Logger logger; + private final Logger logger = mock( Logger.class); private MavenToolchainsXpp3Reader reader = new MavenToolchainsXpp3Reader(); diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java index 9fada05db83b..b1bbba7d5955 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java @@ -40,7 +40,6 @@ import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.classworlds.ClassWorld; import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.logging.Logger; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.graph.DependencyFilter; @@ -48,6 +47,8 @@ import org.eclipse.aether.repository.RemoteRepository; import org.eclipse.aether.util.filter.ExclusionsDependencyFilter; import org.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * BootstrapCoreExtensionManager @@ -55,7 +56,7 @@ @Named public class BootstrapCoreExtensionManager { - private final Logger log; + private final Logger log = LoggerFactory.getLogger( getClass() ); private final DefaultPluginDependenciesResolver pluginDependenciesResolver; @@ -66,11 +67,10 @@ public class BootstrapCoreExtensionManager private final ClassRealm parentRealm; @Inject - public BootstrapCoreExtensionManager( Logger log, DefaultPluginDependenciesResolver pluginDependenciesResolver, + public BootstrapCoreExtensionManager( DefaultPluginDependenciesResolver pluginDependenciesResolver, DefaultRepositorySystemSessionFactory repositorySystemSessionFactory, PlexusContainer container ) { - this.log = log; this.pluginDependenciesResolver = pluginDependenciesResolver; this.repositorySystemSessionFactory = repositorySystemSessionFactory; this.classWorld = ( (DefaultPlexusContainer) container ).getClassWorld(); diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml index be4b99399f7d..03e2f5915ce9 100644 --- a/maven-plugin-api/pom.xml +++ b/maven-plugin-api/pom.xml @@ -34,6 +34,10 @@ under the License. The API for plugins - Mojos - development. + + org.slf4j + slf4j-api + org.apache.maven maven-model diff --git a/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java b/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java index 1ed64ecaa9e3..aec0bb1f3d87 100644 --- a/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java +++ b/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java @@ -20,7 +20,7 @@ */ import org.apache.maven.plugin.logging.Log; -import org.codehaus.plexus.logging.Logger; +import org.slf4j.Logger; /** * @author jdcasey From 677aaf003a36b20d16654c7d0fd56759199678ba Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Fri, 1 Oct 2021 16:10:39 +0200 Subject: [PATCH 2/8] Extend note --- .../apache/maven/plugin/PluginParameterExpressionEvaluator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java index 2d4aaf8d0365..5d9874881821 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java @@ -84,7 +84,7 @@ public class PluginParameterExpressionEvaluator private Properties properties; - @Deprecated //TODO used by the Enforcer plugin + @Deprecated //TODO used by the Enforcer plugin (cstamas: not anymore, since 3.0.0) public PluginParameterExpressionEvaluator( MavenSession session, MojoExecution mojoExecution, PathTranslator pathTranslator, MavenProject project, Properties properties ) From 1f13b5a72be87ea64e815c22f167cc53ce0f145b Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Fri, 1 Oct 2021 16:41:13 +0200 Subject: [PATCH 3/8] Make it what it is: provided --- maven-plugin-api/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml index 03e2f5915ce9..0b6aa735d7f5 100644 --- a/maven-plugin-api/pom.xml +++ b/maven-plugin-api/pom.xml @@ -37,6 +37,7 @@ under the License. org.slf4j slf4j-api + provided org.apache.maven From ba5efcad53370b959cb46bebc11f19f07d3fc673 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Fri, 1 Oct 2021 16:41:28 +0200 Subject: [PATCH 4/8] Format, no code change --- .../maven/toolchain/DefaultToolchainManagerPrivateTest.java | 6 +++--- .../apache/maven/toolchain/DefaultToolchainManagerTest.java | 6 +++--- .../org/apache/maven/toolchain/DefaultToolchainTest.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java index 0c0d6d955e00..ea7168ae8ba5 100644 --- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java +++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java @@ -41,11 +41,11 @@ public class DefaultToolchainManagerPrivateTest { - private final org.slf4j.Logger logger = mock(Logger.class); + private final org.slf4j.Logger logger = mock( Logger.class ); - private final ToolchainFactory toolchainFactory_basicType = mock(ToolchainFactory.class); + private final ToolchainFactory toolchainFactory_basicType = mock( ToolchainFactory.class ); - private final ToolchainFactory toolchainFactory_rareType = mock(ToolchainFactory.class); + private final ToolchainFactory toolchainFactory_rareType = mock( ToolchainFactory.class ); private final DefaultToolchainManagerPrivate toolchainManager = new DefaultToolchainManagerPrivate( logger ); diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java index 3151fcfd45c9..2b390432f079 100644 --- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java +++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java @@ -42,11 +42,11 @@ public class DefaultToolchainManagerTest { - private final Logger logger = mock(Logger.class); + private final Logger logger = mock( Logger.class ); - private final ToolchainFactory toolchainFactory_basicType = mock(ToolchainFactory.class); + private final ToolchainFactory toolchainFactory_basicType = mock( ToolchainFactory.class ); - private final ToolchainFactory toolchainFactory_rareType = mock(ToolchainFactory.class); + private final ToolchainFactory toolchainFactory_rareType = mock( ToolchainFactory.class ); private final DefaultToolchainManager toolchainManager = new DefaultToolchainManager( logger ); diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java index f4d39c5701fd..29f0fc652fcb 100644 --- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java +++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java @@ -39,7 +39,7 @@ public class DefaultToolchainTest { - private final Logger logger = mock( Logger.class); + private final Logger logger = mock( Logger.class ); private MavenToolchainsXpp3Reader reader = new MavenToolchainsXpp3Reader(); From b45c3a928acddfc59e0ba66c14eaf64e78039f73 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Fri, 1 Oct 2021 17:35:27 +0200 Subject: [PATCH 5/8] Make UT ctors pkg protected --- .../org/apache/maven/toolchain/DefaultToolchainManager.java | 2 +- .../apache/maven/toolchain/DefaultToolchainManagerPrivate.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java index 8f9b42dc5e2e..01d62e794260 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java @@ -60,7 +60,7 @@ public DefaultToolchainManager() /** * Ctor for UT. */ - public DefaultToolchainManager( Logger logger ) + DefaultToolchainManager( Logger logger ) { this.logger = requireNonNull( logger ); } diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java index f3b6acdd4fc3..6a276331d982 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java @@ -52,7 +52,7 @@ public DefaultToolchainManagerPrivate() /** * Ctor for UT. */ - public DefaultToolchainManagerPrivate( Logger logger ) + DefaultToolchainManagerPrivate( Logger logger ) { super( logger ); } From 2645d0995dcdbffbbea36a44c9a32a04d2d99183 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Fri, 1 Oct 2021 17:46:15 +0200 Subject: [PATCH 6/8] Do not leak slf4j in plugin-api This is maven4, so breaking change (moved deprecated class) should be okay. Once this merged, we should really un-deprecate mojo Log class. --- .../internal/DefaultMavenPluginManager.java | 3 +- .../maven/plugin/internal/MojoLogWrapper.java | 30 +++++++++++++------ maven-plugin-api/pom.xml | 5 ---- 3 files changed, 22 insertions(+), 16 deletions(-) rename maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java => maven-core/src/main/java/org/apache/maven/plugin/internal/MojoLogWrapper.java (87%) 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 9e3fdd752f94..ea304d11b519 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 @@ -25,7 +25,6 @@ import org.apache.maven.execution.MavenSession; import org.apache.maven.execution.scope.internal.MojoExecutionScopeModule; import org.apache.maven.model.Plugin; -import org.apache.maven.monitor.logging.DefaultLog; import org.apache.maven.plugin.ContextEnabled; import org.apache.maven.plugin.DebugConfigurationListener; import org.apache.maven.plugin.ExtensionRealmCache; @@ -568,7 +567,7 @@ else if ( cause instanceof LinkageError ) if ( mojo instanceof Mojo ) { Logger mojoLogger = LoggerFactory.getLogger( mojoDescriptor.getImplementation() ); - ( (Mojo) mojo ).setLog( new DefaultLog( mojoLogger ) ); + ( (Mojo) mojo ).setLog( new MojoLogWrapper( mojoLogger ) ); } Xpp3Dom dom = mojoExecution.getConfiguration(); diff --git a/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/MojoLogWrapper.java similarity index 87% rename from maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java rename to maven-core/src/main/java/org/apache/maven/plugin/internal/MojoLogWrapper.java index aec0bb1f3d87..060dffdbd8a0 100644 --- a/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/MojoLogWrapper.java @@ -1,4 +1,4 @@ -package org.apache.maven.monitor.logging; +package org.apache.maven.plugin.internal; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,21 +22,19 @@ import org.apache.maven.plugin.logging.Log; import org.slf4j.Logger; +import static java.util.Objects.requireNonNull; + /** * @author jdcasey - * - * @deprecated Use SLF4J directly */ -@Deprecated -public class DefaultLog +public class MojoLogWrapper implements Log { - private final Logger logger; - public DefaultLog( Logger logger ) + public MojoLogWrapper( Logger logger ) { - this.logger = logger; + this.logger = requireNonNull( logger ); } public void debug( CharSequence content ) @@ -56,79 +54,93 @@ private String toString( CharSequence content ) } } + @Override public void debug( CharSequence content, Throwable error ) { logger.debug( toString( content ), error ); } + @Override public void debug( Throwable error ) { logger.debug( "", error ); } + @Override public void info( CharSequence content ) { logger.info( toString( content ) ); } + @Override public void info( CharSequence content, Throwable error ) { logger.info( toString( content ), error ); } + @Override public void info( Throwable error ) { logger.info( "", error ); } + @Override public void warn( CharSequence content ) { logger.warn( toString( content ) ); } + @Override public void warn( CharSequence content, Throwable error ) { logger.warn( toString( content ), error ); } + @Override public void warn( Throwable error ) { logger.warn( "", error ); } + @Override public void error( CharSequence content ) { logger.error( toString( content ) ); } + @Override public void error( CharSequence content, Throwable error ) { logger.error( toString( content ), error ); } + @Override public void error( Throwable error ) { logger.error( "", error ); } + @Override public boolean isDebugEnabled() { return logger.isDebugEnabled(); } + @Override public boolean isInfoEnabled() { return logger.isInfoEnabled(); } + @Override public boolean isWarnEnabled() { return logger.isWarnEnabled(); } + @Override public boolean isErrorEnabled() { return logger.isErrorEnabled(); } - } diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml index 0b6aa735d7f5..be4b99399f7d 100644 --- a/maven-plugin-api/pom.xml +++ b/maven-plugin-api/pom.xml @@ -34,11 +34,6 @@ under the License. The API for plugins - Mojos - development. - - org.slf4j - slf4j-api - provided - org.apache.maven maven-model From ffab2ac0707a1bdbcc5825bfc4dab63fbea48ce1 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Sat, 2 Oct 2021 10:04:26 +0200 Subject: [PATCH 7/8] Marked ctor needed for UT And moved UT in right package to be able to use pkg private ctor --- .../maven/lifecycle/internal/builder/BuilderCommon.java | 9 ++++++--- .../internal/{ => builder}/BuilderCommonTest.java | 7 ++++--- 2 files changed, 10 insertions(+), 6 deletions(-) rename maven-core/src/test/java/org/apache/maven/lifecycle/internal/{ => builder}/BuilderCommonTest.java (94%) diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java index 86d49f58e2ea..c8a810a4a4b9 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java @@ -88,9 +88,12 @@ public BuilderCommon() this.logger = LoggerFactory.getLogger( getClass() ); } - public BuilderCommon( LifecycleDebugLogger lifecycleDebugLogger, - LifecycleExecutionPlanCalculator lifeCycleExecutionPlanCalculator, - Logger logger ) + /** + * Ctor needed for UT. + */ + BuilderCommon( LifecycleDebugLogger lifecycleDebugLogger, + LifecycleExecutionPlanCalculator lifeCycleExecutionPlanCalculator, + Logger logger ) { this.lifecycleDebugLogger = lifecycleDebugLogger; this.lifeCycleExecutionPlanCalculator = lifeCycleExecutionPlanCalculator; diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/BuilderCommonTest.java similarity index 94% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java rename to maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/BuilderCommonTest.java index 7a4fb893d57f..497d8a2dc889 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/BuilderCommonTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.lifecycle.internal; +package org.apache.maven.lifecycle.internal.builder; /* * Licensed to the Apache Software Foundation (ASF) under one or more contributor license @@ -19,7 +19,8 @@ import org.apache.maven.execution.MavenSession; import org.apache.maven.lifecycle.MavenExecutionPlan; -import org.apache.maven.lifecycle.internal.builder.BuilderCommon; +import org.apache.maven.lifecycle.internal.LifecycleDebugLogger; +import org.apache.maven.lifecycle.internal.TaskSegment; import org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub; import org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub; import org.junit.jupiter.api.Test; @@ -34,7 +35,7 @@ */ public class BuilderCommonTest { - private Logger logger = mock(Logger.class); + private Logger logger = mock( Logger.class ); @Test public void testResolveBuildPlan() From eed826305fd9109116d1bad45ff5a1fc65ecbc07 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Sat, 2 Oct 2021 16:09:04 +0200 Subject: [PATCH 8/8] Add TODO --- .../org/apache/maven/toolchain/DefaultToolchainManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java index 7abb6a1b9e47..74cb9c6c0b87 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java @@ -46,7 +46,7 @@ public class DefaultToolchainManager implements ToolchainManager { - protected final Logger logger; + protected final Logger logger; // TODO this class is extended, needs refactoring final Map factories;