Skip to content

Commit cfea6eb

Browse files
authored
[MCOMPILER-347] Set Xcludes in config passed to actual compiler (#101)
Co-authored-by: Piotrek Żygieło <[email protected]>
1 parent be9b5ed commit cfea6eb

File tree

3 files changed

+32
-0
lines changed

3 files changed

+32
-0
lines changed

src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java

+8
Original file line numberDiff line numberDiff line change
@@ -953,6 +953,10 @@ else if ( CompilerConfiguration.CompilerReuseStrategy.ReuseSame.getStrategy().eq
953953

954954
compilerConfiguration.setModulepathEntries( getModulepathElements() );
955955

956+
compilerConfiguration.setIncludes( getIncludes() );
957+
958+
compilerConfiguration.setExcludes( getExcludes() );
959+
956960
Map<String, String> effectiveCompilerArguments = getCompilerArguments();
957961

958962
String effectiveCompilerArgument = getCompilerArgument();
@@ -1482,6 +1486,10 @@ private Set<File> getCompileSources( Compiler compiler, CompilerConfiguration co
14821486
return compileSources;
14831487
}
14841488

1489+
protected abstract Set<String> getIncludes();
1490+
1491+
protected abstract Set<String> getExcludes();
1492+
14851493
/**
14861494
* @param compilerConfiguration
14871495
* @param compiler

src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java

+12
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,18 @@ public void execute()
203203
}
204204
}
205205

206+
@Override
207+
protected Set<String> getIncludes()
208+
{
209+
return includes;
210+
}
211+
212+
@Override
213+
protected Set<String> getExcludes()
214+
{
215+
return excludes;
216+
}
217+
206218
@Override
207219
protected void preparePaths( Set<File> sourceFiles )
208220
{

src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java

+12
Original file line numberDiff line numberDiff line change
@@ -497,4 +497,16 @@ protected boolean isTestCompile()
497497
return true;
498498
}
499499

500+
@Override
501+
protected Set<String> getIncludes()
502+
{
503+
return testIncludes;
504+
}
505+
506+
@Override
507+
protected Set<String> getExcludes()
508+
{
509+
return testExcludes;
510+
}
511+
500512
}

0 commit comments

Comments
 (0)