Merge branch 'bugfix/wrong-sourcepath-in-test' of https://github.com/…

…DemonicTutor/maven-annotation-plugin into DemonicTutor-bugfix/wrong-sourcepath-in-test
bsorrentino · Jul 31, 2020 · ad50616 · ad50616
2 parents bca8780 + 2f1380a
commit ad50616
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/processor/src/main/java/org/bsc/maven/plugin/processor/AbstractAnnotationProcessorMojo.java b/processor/src/main/java/org/bsc/maven/plugin/processor/AbstractAnnotationProcessorMojo.java
@@ -359,10 +359,12 @@ private String buildProcessor()
 
     protected abstract java.util.Set<String> getClasspathElements( java.util.Set<String> result );
 
+    protected abstract java.util.List<String> getAllCompileSourceRoots();
+
     private String buildCompileSourcepath( Consumer<String> onSuccess) {
 
-        final java.util.List<String> roots = project.getCompileSourceRoots();
-        
+        final java.util.List<String> roots = getAllCompileSourceRoots();
+
         if( roots == null || roots.isEmpty() ) {
             return null;
         }

diff --git a/processor/src/main/java/org/bsc/maven/plugin/processor/MainAnnotationProcessorMojo.java b/processor/src/main/java/org/bsc/maven/plugin/processor/MainAnnotationProcessorMojo.java
@@ -81,6 +81,11 @@ protected void addCompileSourceRoot(MavenProject project, String dir) {
         project.addCompileSourceRoot(dir);
     }
 
+    @Override
+    protected List<String> getAllCompileSourceRoots() {
+        return project.getCompileSourceRoots();
+    }
+
     @Override
     public File getDefaultOutputDirectory() {
 

diff --git a/processor/src/main/java/org/bsc/maven/plugin/processor/TestAnnotationProcessorMojo.java b/processor/src/main/java/org/bsc/maven/plugin/processor/TestAnnotationProcessorMojo.java
@@ -19,6 +19,7 @@
 package org.bsc.maven.plugin.processor;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
@@ -73,6 +74,14 @@ protected void addCompileSourceRoot(MavenProject project, String dir) {
         project.addTestCompileSourceRoot(dir);
     }
 
+    @Override
+    protected List<String> getAllCompileSourceRoots() {
+        final List<String> all = new ArrayList<>();
+        all.addAll(project.getCompileSourceRoots());
+        all.addAll(project.getTestCompileSourceRoots());
+        return all;
+    }
+
     @Override
     public File getDefaultOutputDirectory() {
         return defaultOutputDirectory;