From f619280e2aeedd0f9dd257bd579dba701c48bded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20=C5=BBygie=C5=82o?= Date: Sat, 12 Mar 2022 13:09:07 +0100 Subject: [PATCH] [MCOMPILER-347] Set Xcludes in config passed to actual compiler --- .../maven/plugin/compiler/AbstractCompilerMojo.java | 8 ++++++++ .../apache/maven/plugin/compiler/CompilerMojo.java | 12 ++++++++++++ .../maven/plugin/compiler/TestCompilerMojo.java | 12 ++++++++++++ 3 files changed, 32 insertions(+) diff --git a/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java index e0ec1dbe..2f083965 100644 --- a/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java +++ b/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java @@ -953,6 +953,10 @@ else if ( CompilerConfiguration.CompilerReuseStrategy.ReuseSame.getStrategy().eq compilerConfiguration.setModulepathEntries( getModulepathElements() ); + compilerConfiguration.setIncludes( getIncludes() ); + + compilerConfiguration.setExcludes( getExcludes() ); + Map effectiveCompilerArguments = getCompilerArguments(); String effectiveCompilerArgument = getCompilerArgument(); @@ -1482,6 +1486,10 @@ private Set getCompileSources( Compiler compiler, CompilerConfiguration co return compileSources; } + protected abstract Set getIncludes(); + + protected abstract Set getExcludes(); + /** * @param compilerConfiguration * @param compiler diff --git a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java index 8c5eee2f..ea41300a 100644 --- a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java +++ b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java @@ -203,6 +203,18 @@ public void execute() } } + @Override + protected Set getIncludes() + { + return includes; + } + + @Override + protected Set getExcludes() + { + return excludes; + } + @Override protected void preparePaths( Set sourceFiles ) { diff --git a/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java index c352cf90..9d9469f6 100644 --- a/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java +++ b/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java @@ -497,4 +497,16 @@ protected boolean isTestCompile() return true; } + @Override + protected Set getIncludes() + { + return testIncludes; + } + + @Override + protected Set getExcludes() + { + return testExcludes; + } + }