From 706bcd27198882e18be19b303a6029044d3de947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= <m.kroening@hotmail.de>
Date: Tue, 19 Mar 2019 16:50:59 +0100
Subject: [PATCH] Issue #6570: Exclude module-info.java from Google and Sun
 configurations

---
 src/main/resources/google_checks.xml                      | 5 +++++
 src/main/resources/sun_checks.xml                         | 6 ++++++
 .../tools/checkstyle/internal/XdocsPagesTest.java         | 1 +
 src/xdocs/config_filefilters.xml                          | 8 ++++++++
 4 files changed, 20 insertions(+)

diff --git a/src/main/resources/google_checks.xml b/src/main/resources/google_checks.xml
index 5cf003d6205f..642e443a0e84 100644
--- a/src/main/resources/google_checks.xml
+++ b/src/main/resources/google_checks.xml
@@ -21,6 +21,11 @@
     <property name="severity" value="warning"/>
 
     <property name="fileExtensions" value="java, properties, xml"/>
+    <!-- Excludes all 'module-info.java' files              -->
+    <!-- See https://checkstyle.org/config_filefilters.html -->
+    <module name="BeforeExecutionExclusionFileFilter">
+        <property name="fileNamePattern" value="module\-info\.java$"/>
+    </module>
     <!-- Checks for whitespace                               -->
     <!-- See http://checkstyle.sf.net/config_whitespace.html -->
     <module name="FileTabCharacter">
diff --git a/src/main/resources/sun_checks.xml b/src/main/resources/sun_checks.xml
index b86e974dec0d..35826d19cb7a 100644
--- a/src/main/resources/sun_checks.xml
+++ b/src/main/resources/sun_checks.xml
@@ -41,6 +41,12 @@
 
     <property name="fileExtensions" value="java, properties, xml"/>
 
+    <!-- Excludes all 'module-info.java' files              -->
+    <!-- See https://checkstyle.org/config_filefilters.html -->
+    <module name="BeforeExecutionExclusionFileFilter">
+        <property name="fileNamePattern" value="module\-info\.java$"/>
+    </module>
+
     <!-- Checks that a package-info.java file exists for each package.     -->
     <!-- See http://checkstyle.sourceforge.net/config_javadoc.html#JavadocPackage -->
     <module name="JavadocPackage"/>
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java
index 8bdc9c2eec28..be4390737eb9 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java
@@ -1380,6 +1380,7 @@ else if (path.toFile().getName().contains("sun")) {
             }
 
             // these modules aren't documented, but are added to the config
+            styleChecks.remove("BeforeExecutionExclusionFileFilter");
             styleChecks.remove("TreeWalker");
             styleChecks.remove("Checker");
 
diff --git a/src/xdocs/config_filefilters.xml b/src/xdocs/config_filefilters.xml
index 30b0642bb3f9..a4eae3915c8c 100644
--- a/src/xdocs/config_filefilters.xml
+++ b/src/xdocs/config_filefilters.xml
@@ -75,6 +75,14 @@
       </subsection>
       <subsection name="Example of Usage" id="BeforeExecutionExclusionFileFilter_Example_of_Usage">
         <ul>
+          <li>
+            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources+filename%3Agoogle_checks.xml+repo%3Acheckstyle%2Fcheckstyle+BeforeExecutionExclusionFileFilter">
+              Google Style</a>
+          </li>
+          <li>
+            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources+filename%3Asun_checks.xml+repo%3Acheckstyle%2Fcheckstyle+BeforeExecutionExclusionFileFilter">
+              Sun Style</a>
+          </li>
           <li>
             <a href="https://github.com/search?q=path%3Aconfig+filename%3Acheckstyle_checks.xml+repo%3Acheckstyle%2Fcheckstyle+BeforeExecutionExclusionFileFilter">
             Checkstyle Style</a>