[#239][#240] Updated classpath for maven plugin

Author: skapral

atom-maven-plugin/src/main/java/com/pragmaticobjects/oo/atom/maven/BaseMojo.java

@@ -6,6 +6,7 @@
 import com.pragmaticobjects.oo.atom.codegen.cp.CpFromString;
 import com.pragmaticobjects.oo.atom.codegen.stage.Stage;
 import com.pragmaticobjects.oo.atom.instrumentation.ApplyStages;
+import io.vavr.collection.HashSet;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -17,6 +18,7 @@
 import java.nio.file.Path;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import org.apache.maven.plugin.descriptor.PluginDescriptor;
 
 /**
  * Base Mojo for different instrumentations
@@ -31,13 +33,19 @@ public abstract class BaseMojo extends AbstractMojo {
     @Parameter
     private String[] excludePackages;
 
-    protected final void doInstrumentation(Stage stage, Path workingDirectory) throws MojoExecutionException, MojoFailureException {
-        if(!project.getPackaging().equals("pom") || instrumentPomProjects) {
-            String classPath = project.getArtifacts().stream()
+    protected final ClassPath buildClassPath() {
+        PluginDescriptor pluginDescriptor = (PluginDescriptor) this.getPluginContext().get("pluginDescriptor");
+        String classPath = HashSet.ofAll(project.getArtifacts())
+                    .addAll(pluginDescriptor.getArtifacts())
                     .map(Artifact::getFile)
                     .map(File::toString)
                     .collect(Collectors.joining(":"));
-            ClassPath cp = new CpFromString(classPath);
+        ClassPath cp = new CpFromString(classPath);
+        return cp;
+    }
+    
+    protected final void doInstrumentation(Stage stage, ClassPath cp, Path workingDirectory) throws MojoExecutionException, MojoFailureException {
+        if(!project.getPackaging().equals("pom") || instrumentPomProjects) {
             new ApplyStages(
                 cp,
                 workingDirectory,

atom-maven-plugin/src/main/java/com/pragmaticobjects/oo/atom/maven/InstrumentMojo.java

@@ -50,6 +50,7 @@ public class InstrumentMojo extends BaseMojo {
     public final void execute() throws MojoExecutionException, MojoFailureException {
         doInstrumentation(
             new StandardInstrumentationStage(stubbedInstrumentation),
+            buildClassPath(),
             Paths.get(outputDirectory)
         );
     }

atom-maven-plugin/src/main/java/com/pragmaticobjects/oo/atom/maven/InstrumentTestsMojo.java

@@ -23,6 +23,8 @@
  */
 package com.pragmaticobjects.oo.atom.maven;
 
+import com.pragmaticobjects.oo.atom.codegen.cp.CpCombined;
+import com.pragmaticobjects.oo.atom.codegen.cp.CpFromString;
 import com.pragmaticobjects.oo.atom.codegen.stage.StandardInstrumentationStage;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -40,8 +42,10 @@
  */
 @Mojo(name = "instrument-tests", defaultPhase = LifecyclePhase.PROCESS_TEST_CLASSES, requiresDependencyResolution = ResolutionScope.TEST)
 public class InstrumentTestsMojo extends BaseMojo {
-    @Parameter(defaultValue = "${project.build.testOutputDirectory}", required = true, readonly = true)
+    @Parameter(defaultValue = "${project.build.outputDirectory}", required = true, readonly = true)
     protected String outputDirectory;
+    @Parameter(defaultValue = "${project.build.testOutputDirectory}", required = true, readonly = true)
+    protected String testOutputDirectory;
 
     @Parameter(defaultValue = "false", required = true, readonly = true)
     protected boolean stubbedInstrumentation;
@@ -50,7 +54,13 @@ public class InstrumentTestsMojo extends BaseMojo {
     public void execute() throws MojoExecutionException, MojoFailureException {
         doInstrumentation(
             new StandardInstrumentationStage(stubbedInstrumentation),
-            Paths.get(outputDirectory)
+            new CpCombined(
+                buildClassPath(),
+                new CpFromString(
+                    outputDirectory
+                )
+            ),
+            Paths.get(testOutputDirectory)
         );
     }
 }