Merge branch 'mojohaus:master' into invokable

Author: pzygielo

pom.xml

@@ -181,7 +181,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>4.5.0</version>
+      <version>4.5.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

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

@@ -29,12 +29,8 @@
 import org.apache.maven.model.Resource;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuilder;
-import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 
 /**
@@ -56,15 +52,6 @@ public abstract class AbstractExecMojo
     @Parameter( defaultValue = "${session}", readonly = true, required = true )
     private MavenSession session;
 
-    @Component
-    private ArtifactResolver artifactResolver;
-
-    @Component
-    private ProjectBuilder projectBuilder;
-
-    @Parameter( defaultValue = "${plugin}", readonly = true ) // Maven 3 only
-    private PluginDescriptor plugin;
-    
     @Parameter( readonly = true, defaultValue = "${plugin.artifacts}" )
     private List<Artifact> pluginDependencies;
 

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

@@ -21,7 +21,6 @@
 import java.util.concurrent.ForkJoinPool;
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Component;
@@ -32,7 +31,6 @@
 import org.apache.maven.project.ProjectBuilder;
 import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult;
-import org.apache.maven.shared.transfer.dependencies.DefaultDependableCoordinate;
 import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
 
 /**

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

@@ -44,7 +44,6 @@
 import java.util.jar.Manifest;
 
 import org.apache.commons.exec.CommandLine;
-import org.apache.commons.exec.DefaultExecutor;
 import org.apache.commons.exec.ExecuteException;
 import org.apache.commons.exec.ExecuteResultHandler;
 import org.apache.commons.exec.ExecuteWatchdog;

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

@@ -22,7 +22,6 @@
 import org.apache.commons.exec.CommandLine;
 import org.apache.commons.exec.DefaultExecutor;
 import org.apache.commons.exec.OS;
-import org.apache.commons.exec.launcher.CommandLauncherFactory;
 import org.apache.commons.exec.launcher.VmsCommandLauncher;
 
 import java.io.File;