Skip to content

Commit 2f1380a

Browse files
author
Markus
committed
fix: process-test should add CompileSourceRoots and TestCompileSourceRoots to javac '-sourcepath' option. fixes #83
1 parent 27f1d64 commit 2f1380a

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

Diff for: processor/src/main/java/org/bsc/maven/plugin/processor/AbstractAnnotationProcessorMojo.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,12 @@ private String buildProcessor()
359359

360360
protected abstract java.util.Set<String> getClasspathElements( java.util.Set<String> result );
361361

362+
protected abstract java.util.List<String> getAllCompileSourceRoots();
363+
362364
private String buildCompileSourcepath( Consumer<String> onSuccess) {
363365

364-
final java.util.List<String> roots = project.getCompileSourceRoots();
365-
366+
final java.util.List<String> roots = getAllCompileSourceRoots();
367+
366368
if( roots == null || roots.isEmpty() ) {
367369
return null;
368370
}

Diff for: processor/src/main/java/org/bsc/maven/plugin/processor/MainAnnotationProcessorMojo.java

+5
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,11 @@ protected void addCompileSourceRoot(MavenProject project, String dir) {
8181
project.addCompileSourceRoot(dir);
8282
}
8383

84+
@Override
85+
protected List<String> getAllCompileSourceRoots() {
86+
return project.getCompileSourceRoots();
87+
}
88+
8489
@Override
8590
public File getDefaultOutputDirectory() {
8691

Diff for: processor/src/main/java/org/bsc/maven/plugin/processor/TestAnnotationProcessorMojo.java

+9
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package org.bsc.maven.plugin.processor;
2020

2121
import java.io.File;
22+
import java.util.ArrayList;
2223
import java.util.List;
2324
import java.util.Set;
2425

@@ -73,6 +74,14 @@ protected void addCompileSourceRoot(MavenProject project, String dir) {
7374
project.addTestCompileSourceRoot(dir);
7475
}
7576

77+
@Override
78+
protected List<String> getAllCompileSourceRoots() {
79+
final List<String> all = new ArrayList<>();
80+
all.addAll(project.getCompileSourceRoots());
81+
all.addAll(project.getTestCompileSourceRoots());
82+
return all;
83+
}
84+
7685
@Override
7786
public File getDefaultOutputDirectory() {
7887
return defaultOutputDirectory;

0 commit comments

Comments
 (0)