[maven-checkstyle-plugin] branch master updated: [MCHECKSTYLE-403] Goal checkstyle:checkstyle ignores testResources

[michaelo]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 47b8ec6  [MCHECKSTYLE-403] Goal checkstyle:checkstyle ignores 
testResources
47b8ec6 is described below

commit 47b8ec6c5b0bb54b90feb16abf7aa1a14488230c
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sat Oct 21 12:22:05 2023 +0200

    [MCHECKSTYLE-403] Goal checkstyle:checkstyle ignores testResources
---
 .../apache/maven/plugins/checkstyle/CheckstyleAggregateReport.java    | 4 ++--
 .../java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleAggregateReport.java
 
b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleAggregateReport.java
index 79563e1..0419d28 100644
--- 
a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleAggregateReport.java
+++ 
b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleAggregateReport.java
@@ -65,10 +65,10 @@ public class CheckstyleAggregateReport extends 
AbstractCheckstyleReport {
                 .setExcludes(excludes)
                 .setFailsOnError(failsOnError)
                 .setIncludes(includes)
-                .setIncludeResources(includeResources)
-                .setIncludeTestResources(includeTestResources)
                 .setResourceIncludes(resourceIncludes)
                 .setResourceExcludes(resourceExcludes)
+                .setIncludeResources(includeResources)
+                .setIncludeTestResources(includeTestResources)
                 .setIncludeTestSourceDirectory(includeTestSourceDirectory)
                 .setListener(getListener())
                 .setProject(project)
diff --git 
a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java 
b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java
index 08d5835..15f16e0 100644
--- a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java
+++ b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java
@@ -64,6 +64,7 @@ public class CheckstyleReport extends 
AbstractCheckstyleReport {
                 .setProject(project)
                 .setSourceDirectories(getSourceDirectories())
                 .setResources(resources)
+                .setTestResources(testResources)
                 .setStringOutputStream(stringOutputStream)
                 .setSuppressionsLocation(suppressionsLocation)
                 .setTestSourceDirectories(getTestSourceDirectories())