Use JSR-330 for component injection

Author: slawekjaranowski

pom.xml

@@ -142,6 +142,12 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>

src/main/java/org/codehaus/mojo/exec/AbstractExecMojo.java

@@ -25,6 +25,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -34,7 +35,6 @@
 import org.apache.maven.model.Resource;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.cli.CommandLineUtils;
@@ -57,8 +57,7 @@
  */
 public abstract class AbstractExecMojo extends AbstractMojo {
 
-    @Component
-    protected RepositorySystem repositorySystem;
+    protected final RepositorySystem repositorySystem;
 
     /**
      * The enclosing project.
@@ -168,6 +167,10 @@ public abstract class AbstractExecMojo extends AbstractMojo {
     @Parameter(property = "exec.includePluginsDependencies", defaultValue = "false")
     protected boolean includePluginDependencies;
 
+    protected AbstractExecMojo(RepositorySystem repositorySystem) {
+        this.repositorySystem = Objects.requireNonNull(repositorySystem);
+    }
+
     /**
      * Collects the project artifacts in the specified List and the project specific classpath (build output and build
      * test output) Files in the specified List, depending on the plugin classpathScope value.

src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java

@@ -1,5 +1,7 @@
 package org.codehaus.mojo.exec;
 
+import javax.inject.Inject;
+
 import java.io.IOException;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -15,6 +17,7 @@
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
@@ -27,12 +30,12 @@
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.resolution.VersionRangeRequest;
 import org.eclipse.aether.resolution.VersionRangeResolutionException;
@@ -226,8 +229,14 @@ public class ExecJavaMojo extends AbstractExecMojo {
     @Parameter(property = "exec.blockSystemExit", defaultValue = "false")
     private boolean blockSystemExit;
 
-    @Component // todo: for maven4 move to Lookup instead
-    private PlexusContainer container;
+    // todo: for maven4 move to Lookup instead
+    private final PlexusContainer container;
+
+    @Inject
+    protected ExecJavaMojo(RepositorySystem repositorySystem, PlexusContainer container) {
+        super(repositorySystem);
+        this.container = Objects.requireNonNull(container);
+    }
 
     /**
      * Execute goal.

src/main/java/org/codehaus/mojo/exec/ExecMojo.java

@@ -19,6 +19,8 @@
  * under the License.
  */
 
+import javax.inject.Inject;
+
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.File;
@@ -61,7 +63,6 @@
 import org.apache.maven.artifact.resolver.filter.IncludesArtifactFilter;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
@@ -74,6 +75,7 @@
 import org.codehaus.plexus.util.cli.Commandline;
 import org.codehaus.plexus.util.cli.DefaultConsumer;
 import org.codehaus.plexus.util.cli.StreamConsumer;
+import org.eclipse.aether.RepositorySystem;
 
 /**
  * A Plugin for executing external programs.
@@ -350,13 +352,18 @@ public class ExecMojo extends AbstractExecMojo {
     @Parameter(property = "exec.toolchainJavaHomeEnvName", defaultValue = "TOOLCHAIN_JAVA_HOME")
     private String toolchainJavaHomeEnvName = "TOOLCHAIN_JAVA_HOME";
 
-    @Component
-    private ToolchainManager toolchainManager;
+    private final ToolchainManager toolchainManager;
 
     public static final String CLASSPATH_TOKEN = "%classpath";
 
     public static final String MODULEPATH_TOKEN = "%modulepath";
 
+    @Inject
+    protected ExecMojo(RepositorySystem repositorySystem, ToolchainManager toolchainManager) {
+        super(repositorySystem);
+        this.toolchainManager = Objects.requireNonNull(toolchainManager);
+    }
+
     /**
      * priority in the execute method will be to use System properties arguments over the pom specification.
      *

src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java

@@ -31,6 +31,7 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
 import org.apache.maven.toolchain.ToolchainManager;
+import org.eclipse.aether.RepositorySystem;
 
 import static java.util.Collections.emptyMap;
 import static org.mockito.ArgumentMatchers.any;
@@ -45,6 +46,7 @@
 public class ExecMojoTest extends AbstractMojoTestCase {
     private MavenSession session = mock(MavenSession.class);
     private ToolchainManager toolchainManager = mock(ToolchainManager.class);
+    private RepositorySystem repositorySystem = mock(RepositorySystem.class);
 
     private static final File LOCAL_REPO = new File("src/test/repository");
 
@@ -65,6 +67,10 @@ static class MockExecMojo extends ExecMojo {
 
         public Map<String, String> systemProperties = new HashMap<>();
 
+        protected MockExecMojo(RepositorySystem repositorySystem, ToolchainManager toolchainManager) {
+            super(repositorySystem, toolchainManager);
+        }
+
         protected int executeCommandLine(
                 Executor exec, CommandLine commandLine, Map enviro, OutputStream out, OutputStream err)
                 throws ExecuteException {
@@ -90,7 +96,7 @@ CommandLine getExecutedCommandline(int index) {
 
     public void setUp() throws Exception {
         super.setUp();
-        mojo = new MockExecMojo();
+        mojo = new MockExecMojo(repositorySystem, toolchainManager);
         // note: most of the tests below assume that the specified
         // executable path is not fully specicied. See ExecMojo#getExecutablePath
         mojo.setExecutable(SOME_EXECUTABLE);
@@ -121,7 +127,7 @@ public void testRunOK() throws MojoExecutionException {
     // MEXEC-12, MEXEC-72
     public void testGetExecutablePath() throws IOException {
 
-        ExecMojo realMojo = new ExecMojo();
+        ExecMojo realMojo = new ExecMojo(repositorySystem, toolchainManager);
 
         File workdir = new File(System.getProperty("user.dir"));
         Map<String, String> enviro = new HashMap<>();
@@ -177,7 +183,7 @@ public void testGetExecutablePathPreferExecutableExtensionsOnWindows() throws IO
         if (!OS.isFamilyWindows()) {
             return;
         }
-        final ExecMojo realMojo = new ExecMojo();
+        final ExecMojo realMojo = new ExecMojo(repositorySystem, toolchainManager);
 
         final String tmp = System.getProperty("java.io.tmpdir");
         final File workdir = new File(tmp, "testGetExecutablePathPreferExecutableExtensionsOnWindows");
@@ -251,7 +257,7 @@ public void testOverrides3() throws MojoExecutionException {
     }
 
     public void testIsResultCodeAFailure() {
-        ExecMojo execMojo = new ExecMojo();
+        ExecMojo execMojo = new ExecMojo(repositorySystem, toolchainManager);
         assertTrue(execMojo.isResultCodeAFailure(1));
         assertFalse(execMojo.isResultCodeAFailure(0));
 
@@ -268,7 +274,7 @@ public void testIsResultCodeAFailure() {
 
     // MEXEC-81
     public void testParseCommandlineOSWin() throws Exception {
-        ExecMojo execMojo = new ExecMojo();
+        ExecMojo execMojo = new ExecMojo(repositorySystem, toolchainManager);
         final String javaHome = "C:\\Java\\jdk1.5.0_15";
         // can only be set by expression or plugin-configuration
         setVariableValueToObject(execMojo, "commandlineArgs", javaHome);
@@ -278,7 +284,7 @@ public void testParseCommandlineOSWin() throws Exception {
 
     public void test_exec_receives_all_parameters() throws MojoExecutionException {
         // given
-        ExecMojo execMojo = new ExecMojo();
+        ExecMojo execMojo = new ExecMojo(repositorySystem, toolchainManager);
         execMojo.setExecutable("mkdir");
         execMojo.setArguments(Arrays.asList("-p", "dist/mails"));
         execMojo.setBasedir(new File("target"));
@@ -358,7 +364,7 @@ private String getCommandLineAsString(CommandLine commandline) {
     }
 
     public void testGetShebang() throws Exception {
-        ExecMojo execMojo = new ExecMojo();
+        ExecMojo execMojo = new ExecMojo(repositorySystem, toolchainManager);
 
         // without shebang
         File noShebang = Files.createTempFile("noShebang", ".sh").toFile();
@@ -384,7 +390,7 @@ public void testGetShebang() throws Exception {
     }
 
     public void testCreateEnvWrapperFile() throws Exception {
-        ExecMojo execMojo = new ExecMojo();
+        ExecMojo execMojo = new ExecMojo(repositorySystem, toolchainManager);
 
         // without shebang
         File envScript = Files.createTempFile("envScript", ".sh").toFile();