From e161c6f8269b7edeffef725906e6709e2fe2e0d9 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Tue, 4 Jun 2019 12:44:29 -0700
Subject: [PATCH] Broaden files covered by checkstyle

Closes gh-16682
---
 spring-boot-parent/pom.xml                                    | 4 +++-
 spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml | 4 +++-
 spring-boot-parent/src/checkstyle/nohttp-whitelist.txt        | 3 ++-
 spring-boot-samples/pom.xml                                   | 4 +++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml
index 56b663d381..4242d95cb7 100644
--- a/spring-boot-parent/pom.xml
+++ b/spring-boot-parent/pom.xml
@@ -540,7 +540,9 @@
 							<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
 							<includeTestSourceDirectory>true</includeTestSourceDirectory>
 							<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
-							<resourceIncludes>**\/*.*</resourceIncludes>
+							<sourceDirectories>./</sourceDirectories>
+							<includes>**/*</includes>
+							<excludes>.git/**/*,target/**/*</excludes>
 						</configuration>
 						<goals>
 							<goal>check</goal>
diff --git a/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml b/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
index 38fbb7d737..139f518c6a 100644
--- a/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
+++ b/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
@@ -3,7 +3,9 @@
 	"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
 	"https://checkstyle.org/dtds/suppressions_1_2.dtd">
 <suppressions>
-<suppress files="[\\/]target[\\/]" checks=".*" />
+	<suppress files="[\\/]transaction-logs[\\/]" checks=".*" />
+	<suppress files="[\\/]target[\\/]" checks=".*" />
+	<suppress files="[\\/]build.log" checks=".*" />
 	<suppress files=".+\.[jar|git|ico|p12]" checks=".*" />
 	<suppress files="SpringApplicationTests\.java" checks="FinalClass" />
 	<suppress files=".+Configuration\.java" checks="HideUtilityClassConstructor" />
diff --git a/spring-boot-parent/src/checkstyle/nohttp-whitelist.txt b/spring-boot-parent/src/checkstyle/nohttp-whitelist.txt
index 79936fb7c7..2c6f8a3b61 100644
--- a/spring-boot-parent/src/checkstyle/nohttp-whitelist.txt
+++ b/spring-boot-parent/src/checkstyle/nohttp-whitelist.txt
@@ -1 +1,2 @@
-^http://livereload.com/protocols/official-7$
+^http://livereload.com/protocols/official-7.*
+^http://exslt.org/common.*
diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml
index a771fbc9be..f0a212453e 100644
--- a/spring-boot-samples/pom.xml
+++ b/spring-boot-samples/pom.xml
@@ -172,7 +172,9 @@
 							<suppressionsLocation>../spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
 							<includeTestSourceDirectory>true</includeTestSourceDirectory>
 							<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
-							<resourceIncludes>**\/*.*</resourceIncludes>
+							<sourceDirectories>./</sourceDirectories>
+							<includes>**/*</includes>
+							<excludes>.git/**/*,target/**/*</excludes>
 						</configuration>
 						<goals>
 							<goal>check</goal>