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 1/2] 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>

From d548c5ed315caa7262e650ad1e57cf953bc06948 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Tue, 4 Jun 2019 12:44:09 -0700
Subject: [PATCH 2/2] Fix checkstyle violations

---
 .../src/restdoc/resources/db/migration/V1__initialize.sql       | 1 +
 .../springframework/restdocs/templates/http-response.snippet    | 2 +-
 .../test/resources/resource-matcher/one/alpha/nested/excluded   | 1 +
 .../src/test/resources/resource-matcher/one/alpha/nested/fileA  | 1 +
 .../src/test/resources/resource-matcher/one/bravo/fileC         | 1 +
 .../src/test/resources/resource-matcher/one/bravo/nested/fileB  | 1 +
 spring-boot-cli/src/test/resources/resource-matcher/one/fileD   | 1 +
 spring-boot-cli/src/test/resources/resource-matcher/three       | 1 +
 spring-boot-cli/src/test/resources/resource-matcher/two/.file   | 1 +
 .../src/test/resources/resource-matcher/two/bravo/fileE         | 1 +
 spring-boot-cli/src/test/resources/resource-matcher/two/fileF   | 1 +
 spring-boot-samples/spring-boot-sample-ant/pom.xml              | 2 +-
 .../spring-boot-sample-traditional/src/main/webapp/index.html   | 2 +-
 .../src/test/resources/META-INF/resources/inmetainfresources    | 1 +
 spring-boot-test/src/test/resources/public/inpublic             | 1 +
 spring-boot-test/src/test/resources/resources/inresources       | 1 +
 spring-boot-test/src/test/resources/static/instatic             | 1 +
 spring-boot-test/src/test/webapp/inwebapp                       | 1 +
 18 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/spring-boot-actuator-docs/src/restdoc/resources/db/migration/V1__initialize.sql b/spring-boot-actuator-docs/src/restdoc/resources/db/migration/V1__initialize.sql
index e69de29bb2..8b13789179 100644
--- a/spring-boot-actuator-docs/src/restdoc/resources/db/migration/V1__initialize.sql
+++ b/spring-boot-actuator-docs/src/restdoc/resources/db/migration/V1__initialize.sql
@@ -0,0 +1 @@
+
diff --git a/spring-boot-actuator-docs/src/restdoc/resources/org/springframework/restdocs/templates/http-response.snippet b/spring-boot-actuator-docs/src/restdoc/resources/org/springframework/restdocs/templates/http-response.snippet
index 90a25e8514..bd02d8c173 100644
--- a/spring-boot-actuator-docs/src/restdoc/resources/org/springframework/restdocs/templates/http-response.snippet
+++ b/spring-boot-actuator-docs/src/restdoc/resources/org/springframework/restdocs/templates/http-response.snippet
@@ -5,4 +5,4 @@ HTTP/1.1 {{statusCode}} {{statusReason}}
 {{name}}: {{value}}
 {{/headers}}
 {{responseBody}}
-----
\ No newline at end of file
+----
diff --git a/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/excluded b/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/excluded
index e69de29bb2..8b13789179 100644
--- a/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/excluded
+++ b/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/excluded
@@ -0,0 +1 @@
+
diff --git a/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/fileA b/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/fileA
index e69de29bb2..8b13789179 100644
--- a/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/fileA
+++ b/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/fileA
@@ -0,0 +1 @@
+
diff --git a/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/fileC b/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/fileC
index e69de29bb2..8b13789179 100644
--- a/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/fileC
+++ b/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/fileC
@@ -0,0 +1 @@
+
diff --git a/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/nested/fileB b/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/nested/fileB
index e69de29bb2..8b13789179 100644
--- a/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/nested/fileB
+++ b/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/nested/fileB
@@ -0,0 +1 @@
+
diff --git a/spring-boot-cli/src/test/resources/resource-matcher/one/fileD b/spring-boot-cli/src/test/resources/resource-matcher/one/fileD
index e69de29bb2..8b13789179 100644
--- a/spring-boot-cli/src/test/resources/resource-matcher/one/fileD
+++ b/spring-boot-cli/src/test/resources/resource-matcher/one/fileD
@@ -0,0 +1 @@
+
diff --git a/spring-boot-cli/src/test/resources/resource-matcher/three b/spring-boot-cli/src/test/resources/resource-matcher/three
index e69de29bb2..8b13789179 100644
--- a/spring-boot-cli/src/test/resources/resource-matcher/three
+++ b/spring-boot-cli/src/test/resources/resource-matcher/three
@@ -0,0 +1 @@
+
diff --git a/spring-boot-cli/src/test/resources/resource-matcher/two/.file b/spring-boot-cli/src/test/resources/resource-matcher/two/.file
index 8b13789179..139597f9cb 100644
--- a/spring-boot-cli/src/test/resources/resource-matcher/two/.file
+++ b/spring-boot-cli/src/test/resources/resource-matcher/two/.file
@@ -1 +1,2 @@
 
+
diff --git a/spring-boot-cli/src/test/resources/resource-matcher/two/bravo/fileE b/spring-boot-cli/src/test/resources/resource-matcher/two/bravo/fileE
index e69de29bb2..8b13789179 100644
--- a/spring-boot-cli/src/test/resources/resource-matcher/two/bravo/fileE
+++ b/spring-boot-cli/src/test/resources/resource-matcher/two/bravo/fileE
@@ -0,0 +1 @@
+
diff --git a/spring-boot-cli/src/test/resources/resource-matcher/two/fileF b/spring-boot-cli/src/test/resources/resource-matcher/two/fileF
index e69de29bb2..8b13789179 100644
--- a/spring-boot-cli/src/test/resources/resource-matcher/two/fileF
+++ b/spring-boot-cli/src/test/resources/resource-matcher/two/fileF
@@ -0,0 +1 @@
+
diff --git a/spring-boot-samples/spring-boot-sample-ant/pom.xml b/spring-boot-samples/spring-boot-sample-ant/pom.xml
index 09d7d14833..8447647ffa 100644
--- a/spring-boot-samples/spring-boot-sample-ant/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-ant/pom.xml
@@ -102,4 +102,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/index.html b/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/index.html
index 325c1f7946..474e67a1c0 100644
--- a/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/index.html
+++ b/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/index.html
@@ -3,4 +3,4 @@
 <h1>Hello</h1>
 Hello World!
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spring-boot-test/src/test/resources/META-INF/resources/inmetainfresources b/spring-boot-test/src/test/resources/META-INF/resources/inmetainfresources
index e69de29bb2..8b13789179 100644
--- a/spring-boot-test/src/test/resources/META-INF/resources/inmetainfresources
+++ b/spring-boot-test/src/test/resources/META-INF/resources/inmetainfresources
@@ -0,0 +1 @@
+
diff --git a/spring-boot-test/src/test/resources/public/inpublic b/spring-boot-test/src/test/resources/public/inpublic
index e69de29bb2..8b13789179 100644
--- a/spring-boot-test/src/test/resources/public/inpublic
+++ b/spring-boot-test/src/test/resources/public/inpublic
@@ -0,0 +1 @@
+
diff --git a/spring-boot-test/src/test/resources/resources/inresources b/spring-boot-test/src/test/resources/resources/inresources
index e69de29bb2..8b13789179 100644
--- a/spring-boot-test/src/test/resources/resources/inresources
+++ b/spring-boot-test/src/test/resources/resources/inresources
@@ -0,0 +1 @@
+
diff --git a/spring-boot-test/src/test/resources/static/instatic b/spring-boot-test/src/test/resources/static/instatic
index e69de29bb2..8b13789179 100644
--- a/spring-boot-test/src/test/resources/static/instatic
+++ b/spring-boot-test/src/test/resources/static/instatic
@@ -0,0 +1 @@
+
diff --git a/spring-boot-test/src/test/webapp/inwebapp b/spring-boot-test/src/test/webapp/inwebapp
index e69de29bb2..8b13789179 100644
--- a/spring-boot-test/src/test/webapp/inwebapp
+++ b/spring-boot-test/src/test/webapp/inwebapp
@@ -0,0 +1 @@
+