[MCOMPILER-347] Set Xcludes in config passed to actual compiler

apache · Mar 12, 2022 · f619280 · f619280
1 parent be9b5ed
commit f619280
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 0 deletions.
diff --git 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<String, String> effectiveCompilerArguments = getCompilerArguments();
 
         String effectiveCompilerArgument = getCompilerArgument();
@@ -1482,6 +1486,10 @@ private Set<File> getCompileSources( Compiler compiler, CompilerConfiguration co
         return compileSources;
     }
 
+    protected abstract Set<String> getIncludes();
+
+    protected abstract Set<String> 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
@@ -203,6 +203,18 @@ public void execute()
         }
     }
 
+    @Override
+    protected Set<String> getIncludes()
+    {
+        return includes;
+    }
+
+    @Override
+    protected Set<String> getExcludes()
+    {
+        return excludes;
+    }
+
     @Override
     protected void preparePaths( Set<File> 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
@@ -497,4 +497,16 @@ protected boolean isTestCompile()
         return true;
     }
 
+    @Override
+    protected Set<String> getIncludes()
+    {
+        return testIncludes;
+    }
+
+    @Override
+    protected Set<String> getExcludes()
+    {
+        return testExcludes;
+    }
+
 }