Skip to content

refactor: Replace Plexus AbstractLogEnabled with SLF4J #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elharo merged 3 commits into from
Nov 17, 2024
Merged

refactor: Replace Plexus AbstractLogEnabled with SLF4J #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b386e38
refactor: Replace Plexus AbstractLogEnabled with SLF4J
timtebeek Nov 16, 2024
9c6680b
Move `slf4j-api` to compile scope now that we no longer log using Plexus
timtebeek Nov 16, 2024
8f12132
Fix checkstyle violation
timtebeek Nov 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
11 changes: 7 additions & 4 deletions src/main/java/org/apache/maven/plugins/javadoc/resolver/ResourceResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,24 @@
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;
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;

Expand Down Expand Up @@ -220,8 +223,8 @@ private List<JavadocBundle> resolveBundlesFromArtifacts(
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);
}
}

Expand Down