plugin: AbstractCheckMojo: use PluginExecutor

plugin/src/main/java/net/kemitix/checkstyle/ruleset/plugin/AbstractCheckMojo.java

@@ -40,7 +40,6 @@ 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.xml.pull.XmlPullParserException;
-import org.twdata.maven.mojoexecutor.MojoExecutor;
 
 import java.io.FileReader;
 import java.io.IOException;
@@ -89,6 +88,12 @@ abstract class AbstractCheckMojo extends AbstractMojo {
     @Component
     private BuildPluginManager pluginManager = null;
 
+    private final PluginExecutor pluginExecutor;
+
+    AbstractCheckMojo(final PluginExecutor pluginExecutor) {
+        this.pluginExecutor = pluginExecutor;
+    }
+
     /**
      * Execute Checkstyle Check.
      *
@@ -111,17 +116,17 @@ abstract class AbstractCheckMojo extends AbstractMojo {
 
         // configure
         val checkstylePlugin = getPlugin(pluginVersion, checkstyleVersion, sevntuVersion);
-        val configuration = MojoExecutor.configuration(
+        val configuration = pluginExecutor.configuration(
-                MojoExecutor.element(CONFIG_LOCATION, String.format("net/kemitix/checkstyle-%s.xml", level)),
+                pluginExecutor.element(CONFIG_LOCATION, String.format("net/kemitix/checkstyle-%s.xml", level)),
-                MojoExecutor.element(SOURCE_DIR, mavenProject.getBuild().getSourceDirectory())
+                pluginExecutor.element(SOURCE_DIR, mavenProject.getBuild().getSourceDirectory())
                                                       );
-        val environment = MojoExecutor.executionEnvironment(mavenProject, mavenSession, pluginManager);
+        val environment = pluginExecutor.executionEnvironment(mavenProject, mavenSession, pluginManager);
 
         // run
         info("Running Checkstyle %s (sevntu: %s) with ruleset %s (%s)", checkstyleVersion, sevntuVersion, level,
              rulesetVersion
             );
-        MojoExecutor.executeMojo(checkstylePlugin, "check", configuration, environment);
+        pluginExecutor.executeMojo(checkstylePlugin, "check", configuration, environment);
         info("Checkstyle complete");
     }
 
@@ -133,12 +138,12 @@ abstract class AbstractCheckMojo extends AbstractMojo {
 
     private Plugin getPlugin(final String pluginVersion, final String checkstyleVersion, final String sevntuVersion) {
         // create checkstyle dependencies
-        val checkstyle = MojoExecutor.dependency(CHECKSTYLE_GROUPID, CHECKSTYLE_ARTIFACTID, checkstyleVersion);
+        val checkstyle = pluginExecutor.dependency(CHECKSTYLE_GROUPID, CHECKSTYLE_ARTIFACTID, checkstyleVersion);
-        val sevntu = MojoExecutor.dependency(SEVNTU_GROUPID, SEVNTU_ARTIFACTID, sevntuVersion);
+        val sevntu = pluginExecutor.dependency(SEVNTU_GROUPID, SEVNTU_ARTIFACTID, sevntuVersion);
-        val ruleset = MojoExecutor.dependency(KEMITIX_GROUPID, KEMITIX_ARTIFACTID, rulesetVersion);
+        val ruleset = pluginExecutor.dependency(KEMITIX_GROUPID, KEMITIX_ARTIFACTID, rulesetVersion);
-        val dependencies = MojoExecutor.dependencies(checkstyle, sevntu, ruleset);
+        val dependencies = pluginExecutor.dependencies(checkstyle, sevntu, ruleset);
 
-        return MojoExecutor.plugin(APACHE_PLUGIN_GROUPID, APACHE_PLUGIN_ARTIFACTID, pluginVersion, dependencies);
+        return pluginExecutor.plugin(APACHE_PLUGIN_GROUPID, APACHE_PLUGIN_ARTIFACTID, pluginVersion, dependencies);
     }
 
     private Properties getProperties() throws MojoFailureException {

plugin/src/main/java/net/kemitix/checkstyle/ruleset/plugin/ComplexityCheckMojo.java

@@ -35,7 +35,14 @@ import org.apache.maven.plugins.annotations.Mojo;
  * @author Paul Campbell (pcampbell@kemitix.net)
  */
 @Mojo(name = "5-complexity", defaultPhase = LifecyclePhase.VALIDATE)
-public class ComplexityCheckMojo extends AbstractCheckMojo {
+public final class ComplexityCheckMojo extends AbstractCheckMojo {
+
+    /**
+     * Create the Mojo.
+     */
+    ComplexityCheckMojo() {
+        super(new DefaultPluginExecutor());
+    }
 
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {

plugin/src/main/java/net/kemitix/checkstyle/ruleset/plugin/JavadocCheckMojo.java

@@ -35,7 +35,14 @@ import org.apache.maven.plugins.annotations.Mojo;
  * @author Paul Campbell (pcampbell@kemitix.net)
  */
 @Mojo(name = "3-javadoc", defaultPhase = LifecyclePhase.VALIDATE)
-public class JavadocCheckMojo extends AbstractCheckMojo {
+public final class JavadocCheckMojo extends AbstractCheckMojo {
+
+    /**
+     * Create the Mojo.
+     */
+    JavadocCheckMojo() {
+        super(new DefaultPluginExecutor());
+    }
 
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {

plugin/src/main/java/net/kemitix/checkstyle/ruleset/plugin/LayoutCheckMojo.java

@@ -35,7 +35,14 @@ import org.apache.maven.plugins.annotations.Mojo;
  * @author Paul Campbell (pcampbell@kemitix.net)
  */
 @Mojo(name = "1-layout", defaultPhase = LifecyclePhase.VALIDATE)
-public class LayoutCheckMojo extends AbstractCheckMojo {
+public final class LayoutCheckMojo extends AbstractCheckMojo {
+
+    /**
+     * Create the Mojo.
+     */
+    LayoutCheckMojo() {
+        super(new DefaultPluginExecutor());
+    }
 
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {

plugin/src/main/java/net/kemitix/checkstyle/ruleset/plugin/NamingCheckMojo.java

@@ -35,7 +35,14 @@ import org.apache.maven.plugins.annotations.Mojo;
  * @author Paul Campbell (pcampbell@kemitix.net)
  */
 @Mojo(name = "2-naming", defaultPhase = LifecyclePhase.VALIDATE)
-public class NamingCheckMojo extends AbstractCheckMojo {
+public final class NamingCheckMojo extends AbstractCheckMojo {
+
+    /**
+     * Create the Mojo.
+     */
+    NamingCheckMojo() {
+        super(new DefaultPluginExecutor());
+    }
 
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {

plugin/src/main/java/net/kemitix/checkstyle/ruleset/plugin/TweaksCheckMojo.java

@@ -35,7 +35,14 @@ import org.apache.maven.plugins.annotations.Mojo;
  * @author Paul Campbell (pcampbell@kemitix.net)
  */
 @Mojo(name = "4-tweaks", defaultPhase = LifecyclePhase.VALIDATE)
-public class TweaksCheckMojo extends AbstractCheckMojo {
+public final class TweaksCheckMojo extends AbstractCheckMojo {
+
+    /**
+     * Create the Mojo.
+     */
+    TweaksCheckMojo() {
+        super(new DefaultPluginExecutor());
+    }
 
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {