apache · slawekjaranowski · Oct 12, 2025 · Dec 12, 2024
diff --git a/...ache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java b/...ache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java
@@ -79,14 +79,15 @@
 import org.codehaus.plexus.archiver.UnArchiver;
 import org.codehaus.plexus.archiver.manager.ArchiverManager;
 import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.StringUtils;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.resolution.ArtifactRequest;
 import org.eclipse.aether.resolution.ArtifactResolutionException;
 import org.eclipse.aether.resolution.ArtifactResult;
 import org.objectweb.asm.Opcodes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * JavaMojoDescriptorExtractor, a MojoDescriptor extractor to read descriptors from java classes with annotations.
@@ -97,7 +98,8 @@
  */
 @Named(JavaAnnotationsMojoDescriptorExtractor.NAME)
 @Singleton
-public class JavaAnnotationsMojoDescriptorExtractor extends AbstractLogEnabled implements MojoDescriptorExtractor {
+public class JavaAnnotationsMojoDescriptorExtractor implements MojoDescriptorExtractor {
+    private static final Logger LOGGER = LoggerFactory.getLogger(JavaAnnotationsMojoDescriptorExtractor.class);
     public static final String NAME = "java-annotations";
 
     private static final GroupKey GROUP_KEY = new GroupKey(GroupKey.JAVA_GROUP, 100);
@@ -451,7 +453,7 @@ private DocletTag findInClassHierarchy(JavaClass javaClass, String tagName) {
             } catch (Throwable t) {
                 str = javaClass.getValue();
             }
-            getLogger().warn("Failed extracting tag '" + tagName + "' from class " + str);
+            LOGGER.warn("Failed extracting tag '" + tagName + "' from class " + str);
             throw (NoClassDefFoundError) new NoClassDefFoundError(e.getMessage()).initCause(e);
         }
     }
@@ -491,7 +493,7 @@ private Map<String, JavaAnnotatedElement> extractFieldsAnnotations(
 
             return rawParams;
         } catch (NoClassDefFoundError e) {
-            getLogger().warn("Failed extracting parameters from " + javaClass);
+            LOGGER.warn("Failed extracting parameters from " + javaClass);
             throw e;
         }
     }
@@ -543,7 +545,7 @@ private Map<String, JavaAnnotatedElement> extractMethodsAnnotations(
             } catch (Throwable t) {
                 str = javaClass.getValue();
             }
-            getLogger().warn("Failed extracting methods from " + str);
+            LOGGER.warn("Failed extracting methods from " + str);
             throw (NoClassDefFoundError) new NoClassDefFoundError(e.getMessage()).initCause(e);
         }
     }
@@ -592,10 +594,10 @@ protected void extendJavaProjectBuilderWithSourcesJar(
             } catch (ArtifactResolutionException e) {
                 String message = "Unable to get sources artifact for " + artifact.getId()
                         + ". Some javadoc tags (@since, @deprecated and comments) won't be used";
-                if (getLogger().isDebugEnabled()) {
-                    getLogger().warn(message, e);
+                if (LOGGER.isDebugEnabled()) {
+                    LOGGER.warn(message, e);
                 } else {
-                    getLogger().warn(message);
+                    LOGGER.warn(message);
                 }
                 return;
             }

diff --git a/...pache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScanner.java b/...pache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScanner.java
@@ -49,13 +49,14 @@
 import org.apache.maven.tools.plugin.extractor.annotations.scanner.visitors.MojoClassVisitor;
 import org.apache.maven.tools.plugin.extractor.annotations.scanner.visitors.MojoFieldVisitor;
 import org.apache.maven.tools.plugin.extractor.annotations.scanner.visitors.MojoParameterVisitor;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.reflection.Reflector;
 import org.codehaus.plexus.util.reflection.ReflectorException;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.Type;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Mojo scanner with java annotations.
@@ -65,7 +66,8 @@
  */
 @Named
 @Singleton
-public class DefaultMojoAnnotationsScanner extends AbstractLogEnabled implements MojoAnnotationsScanner {
+public class DefaultMojoAnnotationsScanner implements MojoAnnotationsScanner {
+    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultMojoAnnotationsScanner.class);
     public static final String MVN4_API = "org.apache.maven.api.plugin.annotations.";
     public static final String MOJO_V4 = MVN4_API + "Mojo";
     public static final String EXECUTE_V4 = MVN4_API + "Execute";
@@ -166,7 +168,7 @@ protected Map<String, MojoAnnotatedClass> scanArchive(File archiveFile, Artifact
             }
         } catch (IllegalArgumentException e) {
             // In case of a class with newer specs an IllegalArgumentException can be thrown
-            getLogger().error("Failed to analyze " + archiveFile.getAbsolutePath() + "!/" + zipEntryName);
+            LOGGER.error("Failed to analyze " + archiveFile.getAbsolutePath() + "!/" + zipEntryName);
 
             throw e;
         }
@@ -224,17 +226,15 @@ private void analyzeClassStream(
             ClassReader rdr = new ClassReader(is);
             rdr.accept(mojoClassVisitor, ClassReader.SKIP_FRAMES | ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG);
         } catch (ArrayIndexOutOfBoundsException aiooe) {
-            getLogger()
-                    .warn(
-                            "Error analyzing class " + file + " in " + source + ": ignoring class",
-                            getLogger().isDebugEnabled() ? aiooe : null);
+            LOGGER.warn(
+                    "Error analyzing class " + file + " in " + source + ": ignoring class",
+                    LOGGER.isDebugEnabled() ? aiooe : null);
             return;
         } catch (IllegalArgumentException iae) {
             if (iae.getMessage() == null) {
-                getLogger()
-                        .warn(
-                                "Error analyzing class " + file + " in " + source + ": ignoring class",
-                                getLogger().isDebugEnabled() ? iae : null);
+                LOGGER.warn(
+                        "Error analyzing class " + file + " in " + source + ": ignoring class",
+                        LOGGER.isDebugEnabled() ? iae : null);
                 return;
             } else {
                 throw iae;
@@ -251,10 +251,9 @@ private void analyzeClassStream(
 
         if (mojoAnnotatedClass != null) // see MPLUGIN-206 we can have intermediate classes without annotations
         {
-            if (getLogger().isDebugEnabled() && mojoAnnotatedClass.hasAnnotations()) {
-                getLogger()
-                        .debug("found MojoAnnotatedClass:" + mojoAnnotatedClass.getClassName() + ":"
-                                + mojoAnnotatedClass);
+            if (LOGGER.isDebugEnabled() && mojoAnnotatedClass.hasAnnotations()) {
+                LOGGER.debug(
+                        "found MojoAnnotatedClass:" + mojoAnnotatedClass.getClassName() + ":" + mojoAnnotatedClass);
             }
             mojoAnnotatedClass.setArtifact(artifact);
             mojoAnnotatedClasses.put(mojoAnnotatedClass.getClassName(), mojoAnnotatedClass);

diff --git a/.../maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractorTest.java b/.../maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractorTest.java
@@ -35,13 +35,11 @@
 import org.apache.maven.tools.plugin.DefaultPluginToolsRequest;
 import org.apache.maven.tools.plugin.extractor.ExtractionException;
 import org.apache.maven.tools.plugin.extractor.annotations.scanner.DefaultMojoAnnotationsScanner;
-import org.codehaus.plexus.logging.Logger;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
 
 class JavaAnnotationsMojoDescriptorExtractorTest {
     @TempDir
@@ -55,7 +53,6 @@ MojoDescriptor extractDescriptorFromMojoClass(Class<? extends AbstractMojo> mojo
         Files.copy(sourceClass, targetDir.resolve(sourceClass.getFileName()));
         JavaAnnotationsMojoDescriptorExtractor mojoDescriptorExtractor = new JavaAnnotationsMojoDescriptorExtractor();
         DefaultMojoAnnotationsScanner scanner = new DefaultMojoAnnotationsScanner();
-        scanner.enableLogging(mock(Logger.class));
         mojoDescriptorExtractor.mojoAnnotationsScanner = scanner;
         PluginDescriptor pluginDescriptor = new PluginDescriptor();
         MavenProject mavenProject = new MavenProject();

diff --git a/...e/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java b/...e/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java
@@ -37,7 +37,6 @@
 import org.apache.maven.tools.plugin.extractor.annotations.ParametersWithGenericsMojo;
 import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ComponentAnnotationContent;
 import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ParameterAnnotationContent;
-import org.codehaus.plexus.logging.Logger;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -46,7 +45,6 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
 
 class DefaultMojoAnnotationsScannerTest {
     private DefaultMojoAnnotationsScanner scanner = new DefaultMojoAnnotationsScanner();
@@ -58,15 +56,13 @@ void testSkipModuleInfoClassInArchive() throws Exception {
 
     @Test
     void testJava8Annotations() throws Exception {
-        scanner.enableLogging(mock(Logger.class));
         scanner.scanArchive(new File("target/test-classes/java8-annotations.jar"), null, false);
     }
 
     @Test
     void scanDeprecatedMojoAnnotatins() throws ExtractionException, IOException {
         File directoryToScan = new File(DeprecatedMojo.class.getResource("").getFile());
 
-        scanner.enableLogging(mock(Logger.class));
         Map<String, MojoAnnotatedClass> result =
                 scanner.scanDirectory(directoryToScan, Collections.singletonList("DeprecatedMojo.class"), null, false);
 
@@ -94,7 +90,6 @@ void scanParametersWithGenerics() throws ExtractionException, IOException {
         File directoryToScan =
                 new File(ParametersWithGenericsMojo.class.getResource("").getFile());
 
-        scanner.enableLogging(mock(Logger.class));
         Map<String, MojoAnnotatedClass> result = scanner.scanDirectory(
                 directoryToScan, Collections.singletonList("ParametersWithGenericsMojo**.class"), null, false);
 
@@ -141,7 +136,6 @@ void scanFooMojoClass() throws Exception {
         request.setIncludePatterns(Arrays.asList("**/FooMojo.class"));
         request.setProject(new MavenProject());
 
-        scanner.enableLogging(mock(Logger.class));
         Map<String, MojoAnnotatedClass> mojoAnnotatedClasses = scanner.scan(request);
 
         System.out.println("mojoAnnotatedClasses:" + mojoAnnotatedClasses);

diff --git a/...java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java b/...java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java
@@ -30,17 +30,19 @@
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.tools.plugin.PluginToolsRequest;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @deprecated Scripting support for Mojos is deprecated and is planned to be removed in Maven 4.0
  * @author jdcasey
  */
 @Deprecated
-public abstract class AbstractScriptedMojoDescriptorExtractor extends AbstractLogEnabled
-        implements MojoDescriptorExtractor {
+public abstract class AbstractScriptedMojoDescriptorExtractor implements MojoDescriptorExtractor {
+    private static final Logger LOGGER = LoggerFactory.getLogger(AbstractScriptedMojoDescriptorExtractor.class);
+
     @Override
     public boolean isDeprecated() {
         return true;
@@ -50,7 +52,7 @@ public boolean isDeprecated() {
     @Override
     public List<MojoDescriptor> execute(PluginToolsRequest request)
             throws ExtractionException, InvalidPluginDescriptorException {
-        getLogger().debug("Running: " + getClass().getName());
+        LOGGER.debug("Running: " + getClass().getName());
         String metadataExtension = getMetadataFileExtension(request);
         String scriptExtension = getScriptFileExtension(request);
 
@@ -75,8 +77,8 @@ public List<MojoDescriptor> execute(PluginToolsRequest request)
                 scriptFilesKeyedByBasedir, project.getBuild().getOutputDirectory(), request);
 
         if (!mojoDescriptors.isEmpty()) {
-            getLogger().warn("Scripting support for mojos is deprecated and is planned to be removed in Maven 4.");
-            getLogger().warn("Found " + mojoDescriptors.size() + " scripted mojos.");
+            LOGGER.warn("Scripting support for mojos is deprecated and is planned to be removed in Maven 4.");
+            LOGGER.warn("Found " + mojoDescriptors.size() + " scripted mojos.");
         }
 
         return mojoDescriptors;
@@ -140,9 +142,8 @@ protected Map<String, Set<File>> gatherFilesByBasedir(
         for (String resourceDir : directories) {
             Set<File> sources = new HashSet<>();
 
-            getLogger()
-                    .debug("Scanning script dir: " + resourceDir + " with extractor: "
-                            + getClass().getName());
+            LOGGER.debug("Scanning script dir: " + resourceDir + " with extractor: "
+                    + getClass().getName());
             File dir = new File(resourceDir);
             if (!dir.isAbsolute()) {
                 dir = new File(basedir, resourceDir).getAbsoluteFile();

diff --git a/...gin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java b/...gin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java
@@ -36,15 +36,15 @@
 import org.apache.maven.tools.plugin.extractor.GroupKey;
 import org.apache.maven.tools.plugin.extractor.MojoDescriptorExtractor;
 import org.apache.maven.tools.plugin.extractor.MojoDescriptorExtractorComparator;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author jdcasey
  */
 @Named
-public class DefaultMojoScanner extends AbstractLogEnabled implements MojoScanner {
+public class DefaultMojoScanner implements MojoScanner {
+    private static final Logger LOGGER = LoggerFactory.getLogger("standalone-scanner-logger");
 
     private Map<String, MojoDescriptorExtractor> mojoDescriptorExtractors;
 
@@ -61,8 +61,6 @@ public class DefaultMojoScanner extends AbstractLogEnabled implements MojoScanne
     @Inject
     public DefaultMojoScanner(Map<String, MojoDescriptorExtractor> extractors) {
         this.mojoDescriptorExtractors = extractors;
-
-        this.enableLogging(new ConsoleLogger(Logger.LEVEL_INFO, "standalone-scanner-logger"));
     }
 
     /**
@@ -78,40 +76,39 @@ public DefaultMojoScanner() {
     @Override
     public void populatePluginDescriptor(PluginToolsRequest request)
             throws ExtractionException, InvalidPluginDescriptorException {
-        Logger logger = getLogger();
 
         int numMojoDescriptors = 0;
 
         List<MojoDescriptorExtractor> orderedExtractors = getOrderedExtractors();
 
-        logger.debug("Using " + orderedExtractors.size() + " mojo extractors.");
+        LOGGER.debug("Using " + orderedExtractors.size() + " mojo extractors.");
 
         HashMap<String, Integer> groupStats = new HashMap<>();
 
         for (MojoDescriptorExtractor extractor : orderedExtractors) {
             GroupKey groupKey = extractor.getGroupKey();
             String extractorId = extractor.getName();
 
-            logger.debug("Applying " + extractorId + " mojo extractor");
+            LOGGER.debug("Applying " + extractorId + " mojo extractor");
 
             List<MojoDescriptor> extractorDescriptors = extractor.execute(request);
 
             int extractorDescriptorsCount = extractorDescriptors.size();
 
-            logger.info(extractorId + " mojo extractor found " + extractorDescriptorsCount + " mojo descriptor"
+            LOGGER.info(extractorId + " mojo extractor found " + extractorDescriptorsCount + " mojo descriptor"
                     + (extractorDescriptorsCount > 1 ? "s" : "") + ".");
             numMojoDescriptors += extractorDescriptorsCount;
 
             if (extractor.isDeprecated() && extractorDescriptorsCount > 0) {
-                logger.warn("");
-                logger.warn("Deprecated extractor " + extractorId
+                LOGGER.warn("");
+                LOGGER.warn("Deprecated extractor " + extractorId
                         + " extracted " + extractorDescriptorsCount
                         + " descriptor" + (extractorDescriptorsCount > 1 ? "s" : "")
                         + ". Upgrade your Mojo definitions.");
                 if (GroupKey.JAVA_GROUP.equals(groupKey.getGroup())) {
-                    logger.warn("You should use Mojo Annotations instead of Javadoc tags.");
+                    LOGGER.warn("You should use Mojo Annotations instead of Javadoc tags.");
                 }
-                logger.warn("");
+                LOGGER.warn("");
             }
 
             if (groupStats.containsKey(groupKey.getGroup())) {
@@ -121,15 +118,15 @@ public void populatePluginDescriptor(PluginToolsRequest request)
             }
 
             for (MojoDescriptor descriptor : extractorDescriptors) {
-                logger.debug("Adding mojo: " + descriptor + " to plugin descriptor.");
+                LOGGER.debug("Adding mojo: " + descriptor + " to plugin descriptor.");
 
                 descriptor.setPluginDescriptor(request.getPluginDescriptor());
 
                 request.getPluginDescriptor().addMojo(descriptor);
             }
         }
 
-        logger.debug("Discovered descriptors by groups: " + groupStats);
+        LOGGER.debug("Discovered descriptors by groups: " + groupStats);
 
         if (numMojoDescriptors == 0 && !request.isSkipErrorNoDescriptorsFound()) {
             throw new InvalidPluginDescriptorException("No mojo definitions were found for plugin: "

diff --git a/...generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java b/...generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
@@ -28,9 +28,6 @@
 
 import org.apache.maven.project.MavenProject;
 import org.apache.velocity.VelocityContext;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
 import org.codehaus.plexus.util.io.CachingOutputStream;
 import org.codehaus.plexus.velocity.VelocityComponent;
 
@@ -44,7 +41,7 @@
  * @author <a href="mailto:[email protected]">Vincent Siveton</a>
  * @since 2.4
  */
-public class PluginHelpGenerator extends AbstractLogEnabled {
+public class PluginHelpGenerator {
     /**
      * Default generated class name
      */
@@ -60,7 +57,7 @@ public class PluginHelpGenerator extends AbstractLogEnabled {
      * Default constructor
      */
     public PluginHelpGenerator() {
-        this.enableLogging(new ConsoleLogger(Logger.LEVEL_INFO, "PluginHelpGenerator"));
+        // nop
     }
 
     // ----------------------------------------------------------------------