(maven-javadoc-plugin) branch master updated: refactor: Replace Plexus AbstractLogEnabled with SLF4J (#338)

[elharo]

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

elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 3bb982d1 refactor: Replace Plexus AbstractLogEnabled with SLF4J (#338)
3bb982d1 is described below

commit 3bb982d1fc30d0e6748d400b176eec7cb4be1018
Author: Tim te Beek <t...@moderne.io>
AuthorDate: Sun Nov 17 13:46:19 2024 +0100

    refactor: Replace Plexus AbstractLogEnabled with SLF4J (#338)
    
    * refactor: Replace Plexus AbstractLogEnabled with SLF4J
    
    Use this link to re-run the recipe: 
https://app.moderne.io/builder/P4zH7djn6?organizationId=QXBhY2hlIE1hdmVu
    
    Co-authored-by: Moderne <t...@moderne.io>
    
    * Move `slf4j-api` to compile scope now that we no longer log using Plexus
    
    * Fix checkstyle violation
    
    ---------
    
    Co-authored-by: Moderne <t...@moderne.io>
---
 pom.xml                                                      | 12 ++++++------
 .../maven/plugins/javadoc/resolver/ResourceResolver.java     | 11 +++++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index eaf71e68..ea1c614b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -286,6 +286,12 @@ under the License.
       <version>2.1.0</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4jVersion}</version>
+    </dependency>
+
     <!-- Plexus -->
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -403,12 +409,6 @@ under the License.
       <version>3.26.3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>${slf4jVersion}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
diff --git 
a/src/main/java/org/apache/maven/plugins/javadoc/resolver/ResourceResolver.java 
b/src/main/java/org/apache/maven/plugins/javadoc/resolver/ResourceResolver.java
index 53cf3b28..51d814b7 100644
--- 
a/src/main/java/org/apache/maven/plugins/javadoc/resolver/ResourceResolver.java
+++ 
b/src/main/java/org/apache/maven/plugins/javadoc/resolver/ResourceResolver.java
@@ -54,7 +54,6 @@ import org.codehaus.plexus.archiver.ArchiverException;
 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.xml.pull.XmlPullParserException;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
@@ -62,13 +61,17 @@ import org.eclipse.aether.graph.DefaultDependencyNode;
 import org.eclipse.aether.graph.DependencyFilter;
 import org.eclipse.aether.resolution.ArtifactRequest;
 import org.eclipse.aether.resolution.ArtifactResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
  */
 @Named
 @Singleton
-public final class ResourceResolver extends AbstractLogEnabled {
+public final class ResourceResolver {
+    private static final Logger LOGGER = 
LoggerFactory.getLogger(ResourceResolver.class);
+
     @Inject
     private RepositorySystem repoSystem;
 
@@ -220,8 +223,8 @@ public final class ResourceResolver extends 
AbstractLogEnabled {
         try {
             dirs = resolveAndUnpack(toResolve, config, 
RESOURCE_VALID_CLASSIFIERS, false);
         } catch (ArtifactResolutionException | ArtifactNotFoundException e) {
-            if (getLogger().isDebugEnabled()) {
-                getLogger().debug(e.getMessage(), e);
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug(e.getMessage(), e);
             }
         }