You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2022/03/12 23:29:15 UTC
[maven-compiler-plugin] branch master updated: [MCOMPILER-347] Set Xcludes in config passed to actual compiler (#101)
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new cfea6eb [MCOMPILER-347] Set Xcludes in config passed to actual compiler (#101)
cfea6eb is described below
commit cfea6eb6509ab3fc56a3b3b3321da11b5ea06052
Author: Piotrek Żygieło <11...@users.noreply.github.com>
AuthorDate: Sun Mar 13 00:29:07 2022 +0100
[MCOMPILER-347] Set Xcludes in config passed to actual compiler (#101)
Co-authored-by: Piotrek Żygieło <pz...@users.noreply.github.com>
---
.../apache/maven/plugin/compiler/AbstractCompilerMojo.java | 8 ++++++++
.../java/org/apache/maven/plugin/compiler/CompilerMojo.java | 12 ++++++++++++
.../org/apache/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 e0ec1db..2f08396 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 @@ public abstract class AbstractCompilerMojo
compilerConfiguration.setModulepathEntries( getModulepathElements() );
+ compilerConfiguration.setIncludes( getIncludes() );
+
+ compilerConfiguration.setExcludes( getExcludes() );
+
Map<String, String> effectiveCompilerArguments = getCompilerArguments();
String effectiveCompilerArgument = getCompilerArgument();
@@ -1482,6 +1486,10 @@ public abstract class AbstractCompilerMojo
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
index 8c5eee2..ea41300 100644
--- a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
+++ b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
@@ -204,6 +204,18 @@ public class CompilerMojo
}
@Override
+ protected Set<String> getIncludes()
+ {
+ return includes;
+ }
+
+ @Override
+ protected Set<String> getExcludes()
+ {
+ return excludes;
+ }
+
+ @Override
protected void preparePaths( Set<File> sourceFiles )
{
//assert compilePath != null;
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 c352cf9..9d9469f 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 @@ public class TestCompilerMojo
return true;
}
+ @Override
+ protected Set<String> getIncludes()
+ {
+ return testIncludes;
+ }
+
+ @Override
+ protected Set<String> getExcludes()
+ {
+ return testExcludes;
+ }
+
}