Guice injection (#801)

* Switch from PLexus Annotations to javax.inject
apache · Dec 20, 2024 · 73d2f5d · 73d2f5d
1 parent 6271ca1
commit 73d2f5d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
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
@@ -18,6 +18,8 @@
  */
 package org.apache.maven.plugin.failsafe;
 
+import javax.inject.Inject;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
@@ -30,7 +32,6 @@
 import org.apache.maven.plugin.surefire.SurefireHelper;
 import org.apache.maven.plugin.surefire.SurefireReportParameters;
 import org.apache.maven.plugin.surefire.log.PluginConsoleLogger;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
@@ -152,6 +153,7 @@ public class VerifyMojo extends AbstractMojo implements SurefireReportParameters
      *
      * @deprecated since of 2.20.1
      */
+    @Deprecated
     @Parameter(property = "encoding", defaultValue = "${project.reporting.outputEncoding}")
     private String encoding;
 
@@ -161,13 +163,17 @@ public class VerifyMojo extends AbstractMojo implements SurefireReportParameters
     @Parameter(defaultValue = "${session}", readonly = true)
     private MavenSession session;
 
-    @Component
-    private Logger logger;
+    private final Logger logger;
 
     private Collection<CommandLineOption> cli;
 
     private volatile PluginConsoleLogger consoleLogger;
 
+    @Inject
+    public VerifyMojo(Logger logger) {
+        this.logger = logger;
+    }
+
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
         cli = commandLineOptions();
@@ -199,10 +205,6 @@ private Exception getBooterForkException(RunResult summary) {
         return null;
     }
 
-    void setLogger(Logger logger) {
-        this.logger = logger;
-    }
-
     private PluginConsoleLogger getConsoleLogger() {
         if (consoleLogger == null) {
             synchronized (this) {

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
@@ -36,28 +36,26 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-/**
- */
 public class VerifyMojoTest {
     private VerifyMojo mojo;
 
     @Rule
     public TemporaryFolder tempFolder = new TemporaryFolder();
 
+    private Logger logger = mock(Logger.class);
+
     @Before
     public void init() throws UnsupportedEncodingException {
-        mojo = new VerifyMojo();
+        mojo = new VerifyMojo(logger);
         mojo.setTestClassesDirectory(tempFolder.getRoot());
         mojo.setReportsDirectory(getTestBaseDir());
     }
 
     private void setupExecuteMocks() {
-        Logger logger = mock(Logger.class);
         when(logger.isErrorEnabled()).thenReturn(true);
         when(logger.isWarnEnabled()).thenReturn(true);
         when(logger.isInfoEnabled()).thenReturn(true);
         when(logger.isDebugEnabled()).thenReturn(false);
-        mojo.setLogger(logger);
 
         MavenSession session = mock(MavenSession.class);
         MavenExecutionRequest request = mock(MavenExecutionRequest.class);