This is an automated email from the ASF dual-hosted git repository.
jjensen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/master by this push:
new 1b07d5105 [SUREFIRE-2291] Change logger from Plexus to SLF4J (#811)
1b07d5105 is described below
commit 1b07d51059171d63e3acc3fcfd4486d9e3b37e8b
Author: Jeff Jensen <jjen...@apache.org>
AuthorDate: Sun Feb 23 11:34:39 2025 -0600
[SUREFIRE-2291] Change logger from Plexus to SLF4J (#811)
* [SUREFIRE-2291] Change logger from Plexus to SLF4J
* Replace org.codehaus.plexus.logging.Logger with org.slf4j.Logger.
* Change from injected Plexus logger to lookup SLF4J logger.
---
maven-failsafe-plugin/pom.xml | 5 ++++
.../apache/maven/plugin/failsafe/VerifyMojo.java | 10 ++++---
.../maven/plugin/failsafe/VerifyMojoTest.java | 2 +-
maven-surefire-common/pom.xml | 5 ++++
.../plugin/surefire/AbstractSurefireMojo.java | 6 ++--
.../plugin/surefire/log/PluginConsoleLogger.java | 32 +++++++++++-----------
.../surefire/providerapi/ProviderDetector.java | 6 ++--
.../AbstractSurefireMojoJava7PlusTest.java | 2 +-
.../plugin/surefire/AbstractSurefireMojoTest.java | 2 +-
.../AbstractSurefireMojoToolchainsTest.java | 2 +-
.../maven/plugin/surefire/MojoMocklessTest.java | 2 +-
.../maven/plugin/surefire/SurefireHelperTest.java | 2 +-
.../surefire/providerapi/ProviderDetectorTest.java | 2 +-
maven-surefire-plugin/pom.xml | 5 ++++
maven-surefire-report-plugin/pom.xml | 2 --
pom.xml | 13 +++++++++
16 files changed, 63 insertions(+), 35 deletions(-)
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index 0d371c294..bd4bf51c9 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -45,6 +45,11 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-api</artifactId>
diff --git
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
index eab52af01..e53f4073e 100644
---
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
+++
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
@@ -18,8 +18,6 @@
*/
package org.apache.maven.plugin.failsafe;
-import javax.inject.Inject;
-
import java.io.File;
import java.io.IOException;
import java.util.Collection;
@@ -38,7 +36,8 @@
import org.apache.maven.surefire.api.cli.CommandLineOption;
import org.apache.maven.surefire.api.suite.RunResult;
import org.apache.maven.surefire.booter.SurefireBooterForkException;
-import org.codehaus.plexus.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.maven.plugin.surefire.SurefireHelper.reportExecution;
import static org.apache.maven.surefire.api.suite.RunResult.noTestsRun;
@@ -168,7 +167,10 @@ public class VerifyMojo extends AbstractMojo implements
SurefireReportParameters
private volatile PluginConsoleLogger consoleLogger;
- @Inject
+ public VerifyMojo() {
+ this.logger = LoggerFactory.getLogger(getClass());
+ }
+
public VerifyMojo(Logger logger) {
this.logger = logger;
}
diff --git
a/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/VerifyMojoTest.java
b/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/VerifyMojoTest.java
index 4d90aa45f..714ea6b25 100644
---
a/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/VerifyMojoTest.java
+++
b/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/VerifyMojoTest.java
@@ -27,11 +27,11 @@
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.codehaus.plexus.logging.Logger;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
+import org.slf4j.Logger;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
index eb1d57549..d6a598ffa 100644
--- a/maven-surefire-common/pom.xml
+++ b/maven-surefire-common/pom.xml
@@ -32,6 +32,11 @@
<description>API used in Surefire and Failsafe MOJO.</description>
<dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-api</artifactId>
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 67e0cb60f..18a7c51fb 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -121,7 +121,8 @@
import org.codehaus.plexus.languages.java.jpms.ResolvePathResult;
import org.codehaus.plexus.languages.java.jpms.ResolvePathsRequest;
import org.codehaus.plexus.languages.java.jpms.ResolvePathsResult;
-import org.codehaus.plexus.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static java.lang.Integer.parseInt;
import static java.util.Arrays.asList;
@@ -743,8 +744,7 @@ public abstract class AbstractSurefireMojo extends
AbstractMojo implements Suref
@Parameter(defaultValue = "${session}", required = true, readonly = true)
private MavenSession session;
- @Component
- private Logger logger;
+ private Logger logger = LoggerFactory.getLogger(getClass());
/**
* (TestNG only) Define the factory class used to create all test
instances.
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/log/PluginConsoleLogger.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/log/PluginConsoleLogger.java
index ca41c8276..15640eb6c 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/log/PluginConsoleLogger.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/log/PluginConsoleLogger.java
@@ -19,7 +19,7 @@
package org.apache.maven.plugin.surefire.log;
import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
-import org.codehaus.plexus.logging.Logger;
+import org.slf4j.Logger;
/**
* Wrapper logger of miscellaneous implementations of {@link Logger}.
@@ -33,67 +33,67 @@
* @see ConsoleLogger
*/
public final class PluginConsoleLogger implements ConsoleLogger {
- private final Logger plexusLogger;
+ private final Logger logger;
- public PluginConsoleLogger(Logger plexusLogger) {
- this.plexusLogger = plexusLogger;
+ public PluginConsoleLogger(Logger logger) {
+ this.logger = logger;
}
@Override
public boolean isDebugEnabled() {
- return plexusLogger.isDebugEnabled();
+ return logger.isDebugEnabled();
}
@Override
public synchronized void debug(String message) {
- plexusLogger.debug(message);
+ logger.debug(message);
}
public synchronized void debug(CharSequence content, Throwable error) {
- plexusLogger.debug(content == null ? "" : content.toString(), error);
+ logger.debug(content == null ? "" : content.toString(), error);
}
@Override
public boolean isInfoEnabled() {
- return plexusLogger.isInfoEnabled();
+ return logger.isInfoEnabled();
}
@Override
public synchronized void info(String message) {
- plexusLogger.info(message);
+ logger.info(message);
}
@Override
public boolean isWarnEnabled() {
- return plexusLogger.isWarnEnabled();
+ return logger.isWarnEnabled();
}
@Override
public synchronized void warning(String message) {
- plexusLogger.warn(message);
+ logger.warn(message);
}
public synchronized void warning(CharSequence content, Throwable error) {
- plexusLogger.warn(content == null ? "" : content.toString(), error);
+ logger.warn(content == null ? "" : content.toString(), error);
}
@Override
public boolean isErrorEnabled() {
- return plexusLogger.isErrorEnabled() ||
plexusLogger.isFatalErrorEnabled();
+ return logger.isErrorEnabled();
}
@Override
public synchronized void error(String message) {
- plexusLogger.error(message);
+ logger.error(message);
}
@Override
public synchronized void error(String message, Throwable t) {
- plexusLogger.error(message, t);
+ logger.error(message, t);
}
@Override
public synchronized void error(Throwable t) {
- plexusLogger.error("", t);
+ logger.error("", t);
}
}
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/surefire/providerapi/ProviderDetector.java
b/maven-surefire-common/src/main/java/org/apache/maven/surefire/providerapi/ProviderDetector.java
index c40f72a3c..02533804d 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/surefire/providerapi/ProviderDetector.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/surefire/providerapi/ProviderDetector.java
@@ -29,7 +29,8 @@
import org.apache.maven.surefire.api.provider.SurefireProvider;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static java.lang.Thread.currentThread;
import static java.util.Arrays.stream;
@@ -41,8 +42,7 @@
*/
@Component(role = ProviderDetector.class)
public final class ProviderDetector {
- @Requirement
- private Logger logger;
+ private Logger logger = LoggerFactory.getLogger(getClass());
@Requirement
private ServiceLoader serviceLoader;
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
index 7f3834b33..39007de0d 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
@@ -45,7 +45,6 @@
import org.codehaus.plexus.languages.java.jpms.ResolvePathResult;
import org.codehaus.plexus.languages.java.jpms.ResolvePathsRequest;
import org.codehaus.plexus.languages.java.jpms.ResolvePathsResult;
-import org.codehaus.plexus.logging.Logger;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
@@ -53,6 +52,7 @@
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
+import org.slf4j.Logger;
import static java.util.Arrays.asList;
import static java.util.Collections.singleton;
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
index 1af67c838..c2967b534 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
@@ -70,7 +70,6 @@
import org.codehaus.plexus.languages.java.jpms.ResolvePathResult;
import org.codehaus.plexus.languages.java.jpms.ResolvePathsRequest;
import org.codehaus.plexus.languages.java.jpms.ResolvePathsResult;
-import org.codehaus.plexus.logging.Logger;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -82,6 +81,7 @@
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
+import org.slf4j.Logger;
import static java.io.File.separatorChar;
import static java.nio.charset.StandardCharsets.UTF_8;
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java
index d4908ae80..44aef2b25 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java
@@ -31,7 +31,6 @@
import org.apache.maven.toolchain.Toolchain;
import org.apache.maven.toolchain.ToolchainManager;
import org.apache.maven.toolchain.java.DefaultJavaToolChain;
-import org.codehaus.plexus.logging.Logger;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
@@ -41,6 +40,7 @@
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
+import org.slf4j.Logger;
import static java.io.File.separatorChar;
import static java.util.Collections.singletonList;
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
index 5e1b0a87e..1ff8487d8 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
@@ -37,8 +37,8 @@
import org.apache.maven.surefire.api.util.DefaultScanResult;
import org.apache.maven.surefire.api.util.SureFireFileManager;
import org.apache.maven.surefire.extensions.ForkNodeFactory;
-import org.codehaus.plexus.logging.Logger;
import org.junit.Test;
+import org.slf4j.Logger;
import static java.util.Arrays.asList;
import static java.util.Collections.singletonList;
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java
index 88c609ea5..a0d658946 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java
@@ -29,11 +29,11 @@
import org.apache.maven.surefire.api.suite.RunResult;
import org.apache.maven.surefire.api.testset.TestSetFailedException;
import org.apache.maven.surefire.booter.SurefireBooterForkException;
-import org.codehaus.plexus.logging.Logger;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.mockito.ArgumentCaptor;
+import org.slf4j.Logger;
import static java.util.Collections.addAll;
import static java.util.Collections.singleton;
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/surefire/providerapi/ProviderDetectorTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/surefire/providerapi/ProviderDetectorTest.java
index 77eff14d4..fc9ac13b6 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/surefire/providerapi/ProviderDetectorTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/surefire/providerapi/ProviderDetectorTest.java
@@ -24,12 +24,12 @@
import java.util.List;
import org.apache.maven.surefire.api.provider.SurefireProvider;
-import org.codehaus.plexus.logging.Logger;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
+import org.slf4j.Logger;
import static java.util.Arrays.asList;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml
index 90051ae07..8663ac252 100644
--- a/maven-surefire-plugin/pom.xml
+++ b/maven-surefire-plugin/pom.xml
@@ -43,6 +43,11 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-api</artifactId>
diff --git a/maven-surefire-report-plugin/pom.xml
b/maven-surefire-report-plugin/pom.xml
index 82a5f2a75..5234cfb98 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -182,8 +182,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.7.36</version>
- <scope>test</scope>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 3c0fb457c..a396fcd37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,10 +107,23 @@
<jvm9ArgsTests />
<jvm.args.tests>${jvm9ArgsTests} -Xms32m -Xmx144m
-XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true
-Djdk.net.URLClassPath.disableClassPathURLCheck=true</jvm.args.tests>
<project.build.outputTimestamp>2024-10-30T12:06:05Z</project.build.outputTimestamp>
+ <slf4jVersion>1.7.36</slf4jVersion>
</properties>
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4jVersion}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4jVersion}</version>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
