From a99131f7273c177f9a0ad364ac5719fa5a83eb6b Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Mon, 3 Jun 2019 23:48:43 -0700
Subject: [PATCH 1/4] Polish resource files to all end with a new line

---
 .../src/test/resources/actuator-docs-index.html             | 1 +
 .../src/test/resources/cache/test-ehcache.xml               | 2 +-
 .../src/test/resources/db/migration/V1__init.sql            | 1 +
 spring-boot-actuator/src/test/resources/logback.xml         | 2 +-
 .../thymeleaf/ThymeleafAutoConfigurationTests.java          | 6 +++---
 spring-boot-autoconfigure/src/test/resources/city.sql       | 2 +-
 .../src/test/resources/custom-schema.ldif                   | 2 +-
 .../src/test/resources/custom-templates/custom.ftl          | 2 +-
 .../src/test/resources/custom-templates/custom.html         | 1 +
 .../src/test/resources/custom-templates/custom.jsp          | 1 +
 .../src/test/resources/custom-templates/custom.tpl          | 2 +-
 .../src/test/resources/custom-templates/custom.vm           | 2 +-
 .../src/test/resources/custom-templates/suffixed.jsp        | 1 +
 spring-boot-autoconfigure/src/test/resources/data.sql       | 2 +-
 .../src/test/resources/db/city/V1__init.sql                 | 2 +-
 .../src/test/resources/db/migration/V1__init.sql            | 1 +
 .../src/test/resources/db/vendors/h2/V1__init.sql           | 1 +
 spring-boot-autoconfigure/src/test/resources/ehcache3.xml   | 2 +-
 .../src/test/resources/logback-test.xml                     | 2 +-
 .../src/test/resources/mustache-templates/foo.html          | 2 +-
 .../src/test/resources/mustache-templates/foo_de.html       | 1 +
 .../src/test/resources/mustache-templates/home.html         | 2 +-
 .../src/test/resources/mustache-templates/layout.html       | 2 +-
 .../src/test/resources/mustache-templates/partial.html      | 2 +-
 .../boot/autoconfigure/cache/hazelcast-specific.xml         | 2 +-
 .../boot/autoconfigure/hazelcast/hazelcast-specific.xml     | 2 +-
 .../org/springframework/boot/autoconfigure/jdbc/another.sql | 2 +-
 .../org/springframework/boot/autoconfigure/jdbc/data.sql    | 2 +-
 .../boot/autoconfigure/jdbc/encoding-data.sql               | 2 +-
 .../org/springframework/boot/autoconfigure/jdbc/schema.sql  | 2 +-
 spring-boot-autoconfigure/src/test/resources/schema.sql     | 2 +-
 .../src/test/resources/templates/data-dialect.html          | 2 +-
 .../src/test/resources/templates/home.ftl                   | 2 +-
 .../src/test/resources/templates/home.html                  | 2 +-
 .../src/test/resources/templates/home.vm                    | 2 +-
 .../src/test/resources/templates/java8time-dialect.html     | 2 +-
 .../src/test/resources/templates/layout.html                | 2 +-
 .../src/test/resources/templates/message.ftl                | 2 +-
 .../src/test/resources/templates/message.html               | 2 +-
 .../src/test/resources/templates/message.vm                 | 2 +-
 .../src/test/resources/templates/prefix/prefixed.ftl        | 2 +-
 .../src/test/resources/templates/prefix/prefixed.tpl        | 2 +-
 .../src/test/resources/templates/prefix/prefixed.vm         | 2 +-
 .../src/test/resources/templates/suffixed.freemarker        | 2 +-
 .../src/test/resources/templates/view.html                  | 2 +-
 .../src/test/resources/welcome-page/index.html              | 1 +
 spring-boot-cli/src/test/resources/.m2/settings.xml         | 2 +-
 .../maven-settings/encrypted/.m2/settings-security.xml      | 2 +-
 .../resources/maven-settings/encrypted/.m2/settings.xml     | 2 +-
 .../src/test/resources/resource-matcher/two/.file           | 1 +
 spring-boot-cli/src/test/resources/schema-all.sql           | 2 +-
 spring-boot-cli/src/test/resources/templates/home.html      | 2 +-
 .../src/test/resources/com/example/myapp/config.yml         | 2 +-
 .../resources/scripts/launch-with-relative-log-folder.sh    | 2 +-
 .../scripts/log-file-ownership-is-changed-when-created.sh   | 2 +-
 .../scripts/log-file-ownership-is-unchanged-when-exists.sh  | 2 +-
 .../src/main/resources/log4j2.xml                           | 2 +-
 .../src/main/resources/ehcache3.xml                         | 2 +-
 .../src/main/resources/db/migration/V1__init.sql            | 2 +-
 .../src/main/resources/static/index.html                    | 2 +-
 .../src/main/resources/static/index.html                    | 2 +-
 .../spring-boot-sample-jooq/src/main/resources/reset.sql    | 2 +-
 .../spring-boot-sample-jpa/src/main/resources/import.sql    | 2 +-
 .../spring-boot-sample-profile/application.yml              | 2 +-
 .../src/main/resources/application.yml                      | 2 +-
 .../src/main/resources/templates/login.html                 | 2 +-
 .../src/main/resources/templates/login.html                 | 2 +-
 .../src/main/resources/data.sql                             | 2 +-
 .../src/main/resources/schema.sql                           | 2 +-
 .../src/main/resources/templates/login.html                 | 2 +-
 .../src/main/resources/schema.sql                           | 2 +-
 .../src/main/resources/templates/login.html                 | 2 +-
 .../src/main/resources/META-INF/schemas/hr.xsd              | 2 +-
 .../springframework/boot/test/autoconfigure/jdbc/schema.sql | 2 +-
 .../test/resources/metadata/configuration-metadata-bar.json | 2 +-
 .../metadata/configuration-metadata-deprecated.json         | 2 +-
 .../resources/metadata/configuration-metadata-empty.json    | 2 +-
 .../test/resources/metadata/configuration-metadata-foo.json | 2 +-
 .../resources/metadata/configuration-metadata-foo2.json     | 2 +-
 .../resources/metadata/configuration-metadata-invalid.json  | 2 +-
 .../test/resources/metadata/configuration-metadata-map.json | 2 +-
 .../resources/metadata/configuration-metadata-root.json     | 2 +-
 .../configurationsample/incremental/BarProperties.snippet   | 2 +-
 .../src/test/resources/root/META-INF/MANIFEST.MF            | 1 +
 .../test/resources/activeprofilerepro-without-override.yml  | 2 +-
 spring-boot/src/test/resources/custom-location.yml          | 2 +-
 spring-boot/src/test/resources/testprofiles.yml             | 2 +-
 spring-boot/src/test/resources/testprofilesdocument.yml     | 2 +-
 spring-boot/src/test/resources/testsetmultiprofiles.yml     | 2 +-
 spring-boot/src/test/resources/testsetmultiprofileslist.yml | 2 +-
 .../src/test/resources/testsetmultiprofileswhitespace.yml   | 2 +-
 spring-boot/src/test/resources/testsetprofiles.yml          | 2 +-
 92 files changed, 94 insertions(+), 83 deletions(-)

diff --git a/spring-boot-actuator/src/test/resources/actuator-docs-index.html b/spring-boot-actuator/src/test/resources/actuator-docs-index.html
index e69de29bb2d..8b137891791 100644
--- a/spring-boot-actuator/src/test/resources/actuator-docs-index.html
+++ b/spring-boot-actuator/src/test/resources/actuator-docs-index.html
@@ -0,0 +1 @@
+
diff --git a/spring-boot-actuator/src/test/resources/cache/test-ehcache.xml b/spring-boot-actuator/src/test/resources/cache/test-ehcache.xml
index 9a50bbab4b9..a2ceaeb47c8 100644
--- a/spring-boot-actuator/src/test/resources/cache/test-ehcache.xml
+++ b/spring-boot-actuator/src/test/resources/cache/test-ehcache.xml
@@ -7,4 +7,4 @@
 
 	<cache name="players" maxEntriesLocalHeap="50"/>
 
-</ehcache>
\ No newline at end of file
+</ehcache>
diff --git a/spring-boot-actuator/src/test/resources/db/migration/V1__init.sql b/spring-boot-actuator/src/test/resources/db/migration/V1__init.sql
index e69de29bb2d..8b137891791 100644
--- a/spring-boot-actuator/src/test/resources/db/migration/V1__init.sql
+++ b/spring-boot-actuator/src/test/resources/db/migration/V1__init.sql
@@ -0,0 +1 @@
+
diff --git a/spring-boot-actuator/src/test/resources/logback.xml b/spring-boot-actuator/src/test/resources/logback.xml
index ee10b29b61c..f6d7406e0c9 100644
--- a/spring-boot-actuator/src/test/resources/logback.xml
+++ b/spring-boot-actuator/src/test/resources/logback.xml
@@ -5,4 +5,4 @@
 		<appender-ref ref="CONSOLE" />
 	</root>
 	<!-- logger name="org.springframework.security" level="DEBUG"/-->
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java
index 136612d62f2..d1ab7f8e0d2 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java
@@ -172,7 +172,7 @@ public class ThymeleafAutoConfigurationTests {
 		this.context.refresh();
 		TemplateEngine engine = this.context.getBean(TemplateEngine.class);
 		Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
-		String result = engine.process("data-dialect", attrs);
+		String result = engine.process("data-dialect", attrs).trim();
 		assertThat(result).isEqualTo("<html><body data-foo=\"bar\"></body></html>");
 	}
 
@@ -183,7 +183,7 @@ public class ThymeleafAutoConfigurationTests {
 		this.context.refresh();
 		TemplateEngine engine = this.context.getBean(TemplateEngine.class);
 		Context attrs = new Context(Locale.UK);
-		String result = engine.process("java8time-dialect", attrs);
+		String result = engine.process("java8time-dialect", attrs).trim();
 		assertThat(result).isEqualTo("<html><body>2015-11-24</body></html>");
 	}
 
@@ -194,7 +194,7 @@ public class ThymeleafAutoConfigurationTests {
 		this.context.refresh();
 		TemplateEngine engine = this.context.getBean(TemplateEngine.class);
 		Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
-		String result = engine.process("home", attrs);
+		String result = engine.process("home", attrs).trim();
 		assertThat(result).isEqualTo("<html><body>bar</body></html>");
 	}
 
diff --git a/spring-boot-autoconfigure/src/test/resources/city.sql b/spring-boot-autoconfigure/src/test/resources/city.sql
index bb2a2eeac2d..a31da42dc3b 100644
--- a/spring-boot-autoconfigure/src/test/resources/city.sql
+++ b/spring-boot-autoconfigure/src/test/resources/city.sql
@@ -1 +1 @@
-INSERT INTO CITY (NAME, STATE, COUNTRY, MAP) values ('Washington', 'DC', 'US', 'Google');
\ No newline at end of file
+INSERT INTO CITY (NAME, STATE, COUNTRY, MAP) values ('Washington', 'DC', 'US', 'Google');
diff --git a/spring-boot-autoconfigure/src/test/resources/custom-schema.ldif b/spring-boot-autoconfigure/src/test/resources/custom-schema.ldif
index a561a201cb1..2bb925dd6d9 100644
--- a/spring-boot-autoconfigure/src/test/resources/custom-schema.ldif
+++ b/spring-boot-autoconfigure/src/test/resources/custom-schema.ldif
@@ -14,4 +14,4 @@ objectClasses: ( 1.3.6.1.4.1.32473.1.2.2
   SUP top
   AUXILIARY
   MAY exampleAttributeName
-  X-ORIGIN 'Managing Schema Document' )
\ No newline at end of file
+  X-ORIGIN 'Managing Schema Document' )
diff --git a/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.ftl b/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.ftl
index 8f4052a5c9e..0d82d79c85d 100644
--- a/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.ftl
+++ b/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.ftl
@@ -1 +1 @@
-custom
\ No newline at end of file
+custom
diff --git a/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.html b/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.html
index e69de29bb2d..8b137891791 100644
--- a/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.html
+++ b/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.html
@@ -0,0 +1 @@
+
diff --git a/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.jsp b/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.jsp
index e69de29bb2d..8b137891791 100755
--- a/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.jsp
+++ b/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.jsp
@@ -0,0 +1 @@
+
diff --git a/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.tpl b/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.tpl
index 06b9992513a..cd07d3d3c64 100644
--- a/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.tpl
+++ b/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.tpl
@@ -1 +1 @@
-yield "custom"
\ No newline at end of file
+yield "custom"
diff --git a/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.vm b/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.vm
index 8f4052a5c9e..0d82d79c85d 100644
--- a/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.vm
+++ b/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.vm
@@ -1 +1 @@
-custom
\ No newline at end of file
+custom
diff --git a/spring-boot-autoconfigure/src/test/resources/custom-templates/suffixed.jsp b/spring-boot-autoconfigure/src/test/resources/custom-templates/suffixed.jsp
index e69de29bb2d..8b137891791 100755
--- a/spring-boot-autoconfigure/src/test/resources/custom-templates/suffixed.jsp
+++ b/spring-boot-autoconfigure/src/test/resources/custom-templates/suffixed.jsp
@@ -0,0 +1 @@
+
diff --git a/spring-boot-autoconfigure/src/test/resources/data.sql b/spring-boot-autoconfigure/src/test/resources/data.sql
index 0d31554b97c..487614d4409 100644
--- a/spring-boot-autoconfigure/src/test/resources/data.sql
+++ b/spring-boot-autoconfigure/src/test/resources/data.sql
@@ -1 +1 @@
-INSERT INTO BAR VALUES (1, 'Andy');
\ No newline at end of file
+INSERT INTO BAR VALUES (1, 'Andy');
diff --git a/spring-boot-autoconfigure/src/test/resources/db/city/V1__init.sql b/spring-boot-autoconfigure/src/test/resources/db/city/V1__init.sql
index 3f9f9d079fd..8439c925c47 100644
--- a/spring-boot-autoconfigure/src/test/resources/db/city/V1__init.sql
+++ b/spring-boot-autoconfigure/src/test/resources/db/city/V1__init.sql
@@ -4,4 +4,4 @@ CREATE TABLE CITY (
   state VARCHAR(30),
   country VARCHAR(30),
   map VARCHAR(30)
-);
\ No newline at end of file
+);
diff --git a/spring-boot-autoconfigure/src/test/resources/db/migration/V1__init.sql b/spring-boot-autoconfigure/src/test/resources/db/migration/V1__init.sql
index e69de29bb2d..8b137891791 100644
--- a/spring-boot-autoconfigure/src/test/resources/db/migration/V1__init.sql
+++ b/spring-boot-autoconfigure/src/test/resources/db/migration/V1__init.sql
@@ -0,0 +1 @@
+
diff --git a/spring-boot-autoconfigure/src/test/resources/db/vendors/h2/V1__init.sql b/spring-boot-autoconfigure/src/test/resources/db/vendors/h2/V1__init.sql
index e69de29bb2d..8b137891791 100644
--- a/spring-boot-autoconfigure/src/test/resources/db/vendors/h2/V1__init.sql
+++ b/spring-boot-autoconfigure/src/test/resources/db/vendors/h2/V1__init.sql
@@ -0,0 +1 @@
+
diff --git a/spring-boot-autoconfigure/src/test/resources/ehcache3.xml b/spring-boot-autoconfigure/src/test/resources/ehcache3.xml
index 73d27c811d5..575fd7cdbb2 100644
--- a/spring-boot-autoconfigure/src/test/resources/ehcache3.xml
+++ b/spring-boot-autoconfigure/src/test/resources/ehcache3.xml
@@ -23,4 +23,4 @@
 		</expiry>
 	</cache>
 
-</config>
\ No newline at end of file
+</config>
diff --git a/spring-boot-autoconfigure/src/test/resources/logback-test.xml b/spring-boot-autoconfigure/src/test/resources/logback-test.xml
index ee274734003..b8a41480d7d 100644
--- a/spring-boot-autoconfigure/src/test/resources/logback-test.xml
+++ b/spring-boot-autoconfigure/src/test/resources/logback-test.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
 	<include resource="org/springframework/boot/logging/logback/base.xml"/>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo.html b/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo.html
index 18624afa99b..fa22264e235 100644
--- a/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo.html
+++ b/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo.html
@@ -1 +1 @@
-Hello {{World}}
\ No newline at end of file
+Hello {{World}}
diff --git a/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html b/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html
index e69de29bb2d..8b137891791 100644
--- a/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html
+++ b/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html
@@ -0,0 +1 @@
+
diff --git a/spring-boot-autoconfigure/src/test/resources/mustache-templates/home.html b/spring-boot-autoconfigure/src/test/resources/mustache-templates/home.html
index 0e134df2ec3..a13594e5add 100644
--- a/spring-boot-autoconfigure/src/test/resources/mustache-templates/home.html
+++ b/spring-boot-autoconfigure/src/test/resources/mustache-templates/home.html
@@ -6,4 +6,4 @@
 	<h2>A Message</h2>
 	<div>{{message}} at {{time}}</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spring-boot-autoconfigure/src/test/resources/mustache-templates/layout.html b/spring-boot-autoconfigure/src/test/resources/mustache-templates/layout.html
index 762ded630fc..31b461b33c8 100644
--- a/spring-boot-autoconfigure/src/test/resources/mustache-templates/layout.html
+++ b/spring-boot-autoconfigure/src/test/resources/mustache-templates/layout.html
@@ -12,4 +12,4 @@
 	</div>
 	<div class="jumbotron">{{#include}}{{body}}{{/include}}</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spring-boot-autoconfigure/src/test/resources/mustache-templates/partial.html b/spring-boot-autoconfigure/src/test/resources/mustache-templates/partial.html
index 6bea208a581..890b290340d 100644
--- a/spring-boot-autoconfigure/src/test/resources/mustache-templates/partial.html
+++ b/spring-boot-autoconfigure/src/test/resources/mustache-templates/partial.html
@@ -12,4 +12,4 @@
 	</div>
 	<div class="jumbotron">{{>content}}</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/cache/hazelcast-specific.xml b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/cache/hazelcast-specific.xml
index f7e59aeaead..c8f7b113122 100644
--- a/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/cache/hazelcast-specific.xml
+++ b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/cache/hazelcast-specific.xml
@@ -14,4 +14,4 @@
 		</join>
 	</network>
 
-</hazelcast>
\ No newline at end of file
+</hazelcast>
diff --git a/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml
index 9a0d0513b7d..627fd039e75 100644
--- a/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml
+++ b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml
@@ -11,4 +11,4 @@
 		</join>
 	</network>
 
-</hazelcast>
\ No newline at end of file
+</hazelcast>
diff --git a/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/another.sql b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/another.sql
index b96a8cbd704..8ada9cf5f3c 100644
--- a/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/another.sql
+++ b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/another.sql
@@ -1,4 +1,4 @@
 CREATE TABLE SPAM (
   id         INTEGER IDENTITY PRIMARY KEY,
   name VARCHAR(30),
-);
\ No newline at end of file
+);
diff --git a/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/data.sql b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/data.sql
index d8701d1faba..068d7392cbc 100644
--- a/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/data.sql
+++ b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/data.sql
@@ -1 +1 @@
-INSERT INTO FOO VALUES (1, 'Andy');
\ No newline at end of file
+INSERT INTO FOO VALUES (1, 'Andy');
diff --git a/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/encoding-data.sql b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/encoding-data.sql
index bf46c110482..030efbf6780 100644
--- a/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/encoding-data.sql
+++ b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/encoding-data.sql
@@ -1,2 +1,2 @@
 INSERT INTO BAR(id, name) VALUES (1, 'bar');
-INSERT INTO BAR(id, name) VALUES (2, 'ばー');
\ No newline at end of file
+INSERT INTO BAR(id, name) VALUES (2, 'ばー');
diff --git a/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/schema.sql b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/schema.sql
index 38de8810573..185560fe78a 100644
--- a/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/schema.sql
+++ b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/schema.sql
@@ -1,4 +1,4 @@
 CREATE TABLE FOO (
   id         INTEGER IDENTITY PRIMARY KEY,
   name VARCHAR(30),
-);
\ No newline at end of file
+);
diff --git a/spring-boot-autoconfigure/src/test/resources/schema.sql b/spring-boot-autoconfigure/src/test/resources/schema.sql
index fdf03687628..35b55fb6046 100644
--- a/spring-boot-autoconfigure/src/test/resources/schema.sql
+++ b/spring-boot-autoconfigure/src/test/resources/schema.sql
@@ -1,4 +1,4 @@
 CREATE TABLE BAR (
   id         INTEGER IDENTITY PRIMARY KEY,
   name VARCHAR(30),
-);
\ No newline at end of file
+);
diff --git a/spring-boot-autoconfigure/src/test/resources/templates/data-dialect.html b/spring-boot-autoconfigure/src/test/resources/templates/data-dialect.html
index 8f8a82b4081..f1a6716764a 100644
--- a/spring-boot-autoconfigure/src/test/resources/templates/data-dialect.html
+++ b/spring-boot-autoconfigure/src/test/resources/templates/data-dialect.html
@@ -1 +1 @@
-<html><body data:foo="${foo}"></body></html>
\ No newline at end of file
+<html><body data:foo="${foo}"></body></html>
diff --git a/spring-boot-autoconfigure/src/test/resources/templates/home.ftl b/spring-boot-autoconfigure/src/test/resources/templates/home.ftl
index 0247178b6e3..5e72f75cb40 100644
--- a/spring-boot-autoconfigure/src/test/resources/templates/home.ftl
+++ b/spring-boot-autoconfigure/src/test/resources/templates/home.ftl
@@ -1 +1 @@
-home
\ No newline at end of file
+home
diff --git a/spring-boot-autoconfigure/src/test/resources/templates/home.html b/spring-boot-autoconfigure/src/test/resources/templates/home.html
index 8f364d3623a..d8a1185cc01 100644
--- a/spring-boot-autoconfigure/src/test/resources/templates/home.html
+++ b/spring-boot-autoconfigure/src/test/resources/templates/home.html
@@ -1 +1 @@
-<html><body th:text="${foo}">Home</body></html>
\ No newline at end of file
+<html><body th:text="${foo}">Home</body></html>
diff --git a/spring-boot-autoconfigure/src/test/resources/templates/home.vm b/spring-boot-autoconfigure/src/test/resources/templates/home.vm
index 0247178b6e3..5e72f75cb40 100644
--- a/spring-boot-autoconfigure/src/test/resources/templates/home.vm
+++ b/spring-boot-autoconfigure/src/test/resources/templates/home.vm
@@ -1 +1 @@
-home
\ No newline at end of file
+home
diff --git a/spring-boot-autoconfigure/src/test/resources/templates/java8time-dialect.html b/spring-boot-autoconfigure/src/test/resources/templates/java8time-dialect.html
index 3bba41f49b9..2c2bce877b2 100644
--- a/spring-boot-autoconfigure/src/test/resources/templates/java8time-dialect.html
+++ b/spring-boot-autoconfigure/src/test/resources/templates/java8time-dialect.html
@@ -1 +1 @@
-<html><body th:text="${#temporals.create('2015','11','24')}"></body></html>
\ No newline at end of file
+<html><body th:text="${#temporals.create('2015','11','24')}"></body></html>
diff --git a/spring-boot-autoconfigure/src/test/resources/templates/layout.html b/spring-boot-autoconfigure/src/test/resources/templates/layout.html
index 900c0de6bd2..57add3758e6 100644
--- a/spring-boot-autoconfigure/src/test/resources/templates/layout.html
+++ b/spring-boot-autoconfigure/src/test/resources/templates/layout.html
@@ -11,4 +11,4 @@
       </div>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spring-boot-autoconfigure/src/test/resources/templates/message.ftl b/spring-boot-autoconfigure/src/test/resources/templates/message.ftl
index 3908877ab6e..b3992342b27 100644
--- a/spring-boot-autoconfigure/src/test/resources/templates/message.ftl
+++ b/spring-boot-autoconfigure/src/test/resources/templates/message.ftl
@@ -1 +1 @@
-Message: ${greeting}
\ No newline at end of file
+Message: ${greeting}
diff --git a/spring-boot-autoconfigure/src/test/resources/templates/message.html b/spring-boot-autoconfigure/src/test/resources/templates/message.html
index 53440f08e73..ba236128ec2 100644
--- a/spring-boot-autoconfigure/src/test/resources/templates/message.html
+++ b/spring-boot-autoconfigure/src/test/resources/templates/message.html
@@ -1 +1 @@
-<html><body>Message: <span th:text="${greeting}">Hello</span></body></html>
\ No newline at end of file
+<html><body>Message: <span th:text="${greeting}">Hello</span></body></html>
diff --git a/spring-boot-autoconfigure/src/test/resources/templates/message.vm b/spring-boot-autoconfigure/src/test/resources/templates/message.vm
index 3908877ab6e..b3992342b27 100644
--- a/spring-boot-autoconfigure/src/test/resources/templates/message.vm
+++ b/spring-boot-autoconfigure/src/test/resources/templates/message.vm
@@ -1 +1 @@
-Message: ${greeting}
\ No newline at end of file
+Message: ${greeting}
diff --git a/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.ftl b/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.ftl
index ba8db465da2..278ed403330 100644
--- a/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.ftl
+++ b/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.ftl
@@ -1 +1 @@
-prefixed
\ No newline at end of file
+prefixed
diff --git a/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.tpl b/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.tpl
index c9c6c42d6c9..05426ef6995 100644
--- a/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.tpl
+++ b/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.tpl
@@ -1 +1 @@
-yield "prefixed"
\ No newline at end of file
+yield "prefixed"
diff --git a/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.vm b/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.vm
index ba8db465da2..278ed403330 100644
--- a/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.vm
+++ b/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.vm
@@ -1 +1 @@
-prefixed
\ No newline at end of file
+prefixed
diff --git a/spring-boot-autoconfigure/src/test/resources/templates/suffixed.freemarker b/spring-boot-autoconfigure/src/test/resources/templates/suffixed.freemarker
index dcce46b0270..cfe8d439ab1 100644
--- a/spring-boot-autoconfigure/src/test/resources/templates/suffixed.freemarker
+++ b/spring-boot-autoconfigure/src/test/resources/templates/suffixed.freemarker
@@ -1 +1 @@
-suffixed
\ No newline at end of file
+suffixed
diff --git a/spring-boot-autoconfigure/src/test/resources/templates/view.html b/spring-boot-autoconfigure/src/test/resources/templates/view.html
index 6f4deeb420e..accdaf1ea19 100644
--- a/spring-boot-autoconfigure/src/test/resources/templates/view.html
+++ b/spring-boot-autoconfigure/src/test/resources/templates/view.html
@@ -7,4 +7,4 @@
     	<span th:text="${foo}">foo</span>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spring-boot-autoconfigure/src/test/resources/welcome-page/index.html b/spring-boot-autoconfigure/src/test/resources/welcome-page/index.html
index e69de29bb2d..8b137891791 100644
--- a/spring-boot-autoconfigure/src/test/resources/welcome-page/index.html
+++ b/spring-boot-autoconfigure/src/test/resources/welcome-page/index.html
@@ -0,0 +1 @@
+
diff --git a/spring-boot-cli/src/test/resources/.m2/settings.xml b/spring-boot-cli/src/test/resources/.m2/settings.xml
index 6cc8d41bd2a..8ae764f39d3 100644
--- a/spring-boot-cli/src/test/resources/.m2/settings.xml
+++ b/spring-boot-cli/src/test/resources/.m2/settings.xml
@@ -30,4 +30,4 @@
 		</proxy>
 	</proxies>
 
-</settings>
\ No newline at end of file
+</settings>
diff --git a/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings-security.xml b/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings-security.xml
index 7b6597c44e9..e1b5cd3c1b4 100644
--- a/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings-security.xml
+++ b/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings-security.xml
@@ -1,3 +1,3 @@
 <settingsSecurity>
 	<master>{oAyWuFO63U8HHgiplpqtgXih0/pwcRA0d+uA+Z7TBEk=}</master>
-</settingsSecurity>
\ No newline at end of file
+</settingsSecurity>
diff --git a/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings.xml b/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings.xml
index 5160df56576..e9c2b39cf3b 100644
--- a/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings.xml
+++ b/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings.xml
@@ -28,4 +28,4 @@
 		</proxy>
 	</proxies>
 
-</settings>
\ No newline at end of file
+</settings>
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 e69de29bb2d..8b137891791 100644
--- a/spring-boot-cli/src/test/resources/resource-matcher/two/.file
+++ b/spring-boot-cli/src/test/resources/resource-matcher/two/.file
@@ -0,0 +1 @@
+
diff --git a/spring-boot-cli/src/test/resources/schema-all.sql b/spring-boot-cli/src/test/resources/schema-all.sql
index 38de8810573..185560fe78a 100644
--- a/spring-boot-cli/src/test/resources/schema-all.sql
+++ b/spring-boot-cli/src/test/resources/schema-all.sql
@@ -1,4 +1,4 @@
 CREATE TABLE FOO (
   id         INTEGER IDENTITY PRIMARY KEY,
   name VARCHAR(30),
-);
\ No newline at end of file
+);
diff --git a/spring-boot-cli/src/test/resources/templates/home.html b/spring-boot-cli/src/test/resources/templates/home.html
index dfdd6c756b5..c1058eb1c5f 100644
--- a/spring-boot-cli/src/test/resources/templates/home.html
+++ b/spring-boot-cli/src/test/resources/templates/home.html
@@ -22,4 +22,4 @@
 			2012 2:17:16 PM CDT</div>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spring-boot-docs/src/test/resources/com/example/myapp/config.yml b/spring-boot-docs/src/test/resources/com/example/myapp/config.yml
index 6a907d9dfc6..befe45ca359 100644
--- a/spring-boot-docs/src/test/resources/com/example/myapp/config.yml
+++ b/spring-boot-docs/src/test/resources/com/example/myapp/config.yml
@@ -1,3 +1,3 @@
 test:
   foo:
-    bar: value
\ No newline at end of file
+    bar: value
diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-relative-log-folder.sh b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-relative-log-folder.sh
index 4f44ee3d2c0..da1f7b11c10 100755
--- a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-relative-log-folder.sh
+++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-relative-log-folder.sh
@@ -5,4 +5,4 @@ echo 'LOG_FOLDER=log' > /test-service/spring-boot-app.conf
 mkdir -p /test-service/log
 start_service
 await_app
-[[ -s /test-service/log/spring-boot-app.log ]] && echo "Log written"
\ No newline at end of file
+[[ -s /test-service/log/spring-boot-app.log ]] && echo "Log written"
diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/log-file-ownership-is-changed-when-created.sh b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/log-file-ownership-is-changed-when-created.sh
index c007f35cadc..5cc9eb46fc6 100755
--- a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/log-file-ownership-is-changed-when-created.sh
+++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/log-file-ownership-is-changed-when-created.sh
@@ -6,4 +6,4 @@ useradd andy
 chown andy /test-service/spring-boot-app.jar
 start_service
 await_app
-ls -al /test-service/log/spring-boot-app.log
\ No newline at end of file
+ls -al /test-service/log/spring-boot-app.log
diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/log-file-ownership-is-unchanged-when-exists.sh b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/log-file-ownership-is-unchanged-when-exists.sh
index ec28e35ac2f..685e1e6100f 100755
--- a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/log-file-ownership-is-unchanged-when-exists.sh
+++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/log-file-ownership-is-unchanged-when-exists.sh
@@ -8,4 +8,4 @@ useradd andy
 chown andy /test-service/spring-boot-app.jar
 start_service
 await_app
-ls -al /test-service/log/spring-boot-app.log
\ No newline at end of file
+ls -al /test-service/log/spring-boot-app.log
diff --git a/spring-boot-samples/spring-boot-sample-actuator-log4j2/src/main/resources/log4j2.xml b/spring-boot-samples/spring-boot-sample-actuator-log4j2/src/main/resources/log4j2.xml
index 2f385bde1aa..dfec9acb0a7 100644
--- a/spring-boot-samples/spring-boot-sample-actuator-log4j2/src/main/resources/log4j2.xml
+++ b/spring-boot-samples/spring-boot-sample-actuator-log4j2/src/main/resources/log4j2.xml
@@ -18,4 +18,4 @@
             <AppenderRef ref="Console"/>
         </Root>
     </Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
diff --git a/spring-boot-samples/spring-boot-sample-cache/src/main/resources/ehcache3.xml b/spring-boot-samples/spring-boot-sample-cache/src/main/resources/ehcache3.xml
index cce17bb79e1..4847f1f118b 100644
--- a/spring-boot-samples/spring-boot-sample-cache/src/main/resources/ehcache3.xml
+++ b/spring-boot-samples/spring-boot-sample-cache/src/main/resources/ehcache3.xml
@@ -11,4 +11,4 @@
 		<jsr107:mbeans enable-statistics="true"/>
 	</cache>
 
-</config>
\ No newline at end of file
+</config>
diff --git a/spring-boot-samples/spring-boot-sample-flyway/src/main/resources/db/migration/V1__init.sql b/spring-boot-samples/spring-boot-sample-flyway/src/main/resources/db/migration/V1__init.sql
index e6ac47ce656..d62c79975cb 100644
--- a/spring-boot-samples/spring-boot-sample-flyway/src/main/resources/db/migration/V1__init.sql
+++ b/spring-boot-samples/spring-boot-sample-flyway/src/main/resources/db/migration/V1__init.sql
@@ -4,4 +4,4 @@ CREATE TABLE PERSON (
 	last_name varchar(255) not null
 );
 
-insert into PERSON (first_name, last_name) values ('Dave', 'Syer');
\ No newline at end of file
+insert into PERSON (first_name, last_name) values ('Dave', 'Syer');
diff --git a/spring-boot-samples/spring-boot-sample-hypermedia-ui-secure/src/main/resources/static/index.html b/spring-boot-samples/spring-boot-sample-hypermedia-ui-secure/src/main/resources/static/index.html
index 66a41f708c6..8842bf81010 100644
--- a/spring-boot-samples/spring-boot-sample-hypermedia-ui-secure/src/main/resources/static/index.html
+++ b/spring-boot-samples/spring-boot-sample-hypermedia-ui-secure/src/main/resources/static/index.html
@@ -2,4 +2,4 @@
 <body>
 	<h1>Hello World!</h1>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spring-boot-samples/spring-boot-sample-hypermedia-ui/src/main/resources/static/index.html b/spring-boot-samples/spring-boot-sample-hypermedia-ui/src/main/resources/static/index.html
index 66a41f708c6..8842bf81010 100644
--- a/spring-boot-samples/spring-boot-sample-hypermedia-ui/src/main/resources/static/index.html
+++ b/spring-boot-samples/spring-boot-sample-hypermedia-ui/src/main/resources/static/index.html
@@ -2,4 +2,4 @@
 <body>
 	<h1>Hello World!</h1>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spring-boot-samples/spring-boot-sample-jooq/src/main/resources/reset.sql b/spring-boot-samples/spring-boot-sample-jooq/src/main/resources/reset.sql
index fc9a4f21daf..b1306d7359c 100644
--- a/spring-boot-samples/spring-boot-sample-jooq/src/main/resources/reset.sql
+++ b/spring-boot-samples/spring-boot-sample-jooq/src/main/resources/reset.sql
@@ -1 +1 @@
-DROP ALL OBJECTS;
\ No newline at end of file
+DROP ALL OBJECTS;
diff --git a/spring-boot-samples/spring-boot-sample-jpa/src/main/resources/import.sql b/spring-boot-samples/spring-boot-sample-jpa/src/main/resources/import.sql
index a3d2222035e..8ede6184326 100644
--- a/spring-boot-samples/spring-boot-sample-jpa/src/main/resources/import.sql
+++ b/spring-boot-samples/spring-boot-sample-jpa/src/main/resources/import.sql
@@ -14,4 +14,4 @@ insert into note_tags(notes_id, tags_id) values (1, 3)
 insert into note_tags(notes_id, tags_id) values (2, 3)
 insert into note_tags(notes_id, tags_id) values (3, 3)
 insert into note_tags(notes_id, tags_id) values (4, 2)
-insert into note_tags(notes_id, tags_id) values (4, 3)
\ No newline at end of file
+insert into note_tags(notes_id, tags_id) values (4, 3)
diff --git a/spring-boot-samples/spring-boot-sample-profile/application.yml b/spring-boot-samples/spring-boot-sample-profile/application.yml
index 6d4e66da9c4..8689513d3b1 100644
--- a/spring-boot-samples/spring-boot-sample-profile/application.yml
+++ b/spring-boot-samples/spring-boot-sample-profile/application.yml
@@ -1 +1 @@
-hello: Bonjour
\ No newline at end of file
+hello: Bonjour
diff --git a/spring-boot-samples/spring-boot-sample-profile/src/main/resources/application.yml b/spring-boot-samples/spring-boot-sample-profile/src/main/resources/application.yml
index 316b1f95d9d..f0f58213812 100644
--- a/spring-boot-samples/spring-boot-sample-profile/src/main/resources/application.yml
+++ b/spring-boot-samples/spring-boot-sample-profile/src/main/resources/application.yml
@@ -4,4 +4,4 @@ name: Phil
 
 spring:
   profiles: goodbye,dev
-name: Everyone
\ No newline at end of file
+name: Everyone
diff --git a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/login.html b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/login.html
index 96b02cb7a38..cace46a3606 100644
--- a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/login.html
+++ b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/login.html
@@ -31,4 +31,4 @@
 		</div>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/login.html b/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/login.html
index 96b02cb7a38..cace46a3606 100644
--- a/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/login.html
+++ b/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/login.html
@@ -31,4 +31,4 @@
 		</div>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/data.sql b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/data.sql
index 2633f21e787..76ae21c97aa 100644
--- a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/data.sql
+++ b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/data.sql
@@ -1,3 +1,3 @@
 insert into users (username, password, enabled) values ('user', 'user', true);
 
-insert into authorities (username, authority) values ('user', 'ROLE_ADMIN');
\ No newline at end of file
+insert into authorities (username, authority) values ('user', 'ROLE_ADMIN');
diff --git a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/schema.sql b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/schema.sql
index cf6c5fdda60..00b20c8d334 100644
--- a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/schema.sql
+++ b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/schema.sql
@@ -7,4 +7,4 @@ create table users (
 create table authorities (
   username varchar(256),
   authority varchar(256)
-);
\ No newline at end of file
+);
diff --git a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/login.html b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/login.html
index 96b02cb7a38..cace46a3606 100644
--- a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/login.html
+++ b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/login.html
@@ -31,4 +31,4 @@
 		</div>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/schema.sql b/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/schema.sql
index cf6c5fdda60..00b20c8d334 100644
--- a/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/schema.sql
+++ b/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/schema.sql
@@ -7,4 +7,4 @@ create table users (
 create table authorities (
   username varchar(256),
   authority varchar(256)
-);
\ No newline at end of file
+);
diff --git a/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/login.html b/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/login.html
index 96b02cb7a38..cace46a3606 100644
--- a/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/login.html
+++ b/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/login.html
@@ -31,4 +31,4 @@
 		</div>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spring-boot-samples/spring-boot-sample-webservices/src/main/resources/META-INF/schemas/hr.xsd b/spring-boot-samples/spring-boot-sample-webservices/src/main/resources/META-INF/schemas/hr.xsd
index 2c32e433c4a..b27b7bf48c6 100644
--- a/spring-boot-samples/spring-boot-sample-webservices/src/main/resources/META-INF/schemas/hr.xsd
+++ b/spring-boot-samples/spring-boot-sample-webservices/src/main/resources/META-INF/schemas/hr.xsd
@@ -23,4 +23,4 @@
 			<xs:element name="LastName" type="xs:string"/>
 		</xs:sequence>
 	</xs:complexType>
-</xs:schema>
\ No newline at end of file
+</xs:schema>
diff --git a/spring-boot-test-autoconfigure/src/test/resources/org/springframework/boot/test/autoconfigure/jdbc/schema.sql b/spring-boot-test-autoconfigure/src/test/resources/org/springframework/boot/test/autoconfigure/jdbc/schema.sql
index c7559fe8cc7..8b9e6aede2a 100644
--- a/spring-boot-test-autoconfigure/src/test/resources/org/springframework/boot/test/autoconfigure/jdbc/schema.sql
+++ b/spring-boot-test-autoconfigure/src/test/resources/org/springframework/boot/test/autoconfigure/jdbc/schema.sql
@@ -1 +1 @@
-create table example (id int, name varchar);
\ No newline at end of file
+create table example (id int, name varchar);
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-bar.json b/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-bar.json
index 6f07ce19ba9..6404622bcfc 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-bar.json
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-bar.json
@@ -62,4 +62,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-deprecated.json b/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-deprecated.json
index af288967e19..65137fc4ffb 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-deprecated.json
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-deprecated.json
@@ -35,4 +35,4 @@
       }
     }
 	]
-}
\ No newline at end of file
+}
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-empty.json b/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-empty.json
index b42f309e7ae..c8c4105eb57 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-empty.json
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-empty.json
@@ -1,3 +1,3 @@
 {
   "foo": "bar"
-}
\ No newline at end of file
+}
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo.json b/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo.json
index 74b1c57bfb7..22fc37507c4 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo.json
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo.json
@@ -56,4 +56,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo2.json b/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo2.json
index a57f4992cfd..33e89c49c10 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo2.json
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo2.json
@@ -20,4 +20,4 @@
       "sourceType": "org.acme.Foo2"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-invalid.json b/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-invalid.json
index ca2f0711151..1d6b5f5c5c6 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-invalid.json
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-invalid.json
@@ -5,4 +5,4 @@
       "sourceType": "org.acme.Invalid"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-map.json b/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-map.json
index 599ed64f194..9901874b4b5 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-map.json
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-map.json
@@ -76,4 +76,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-root.json b/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-root.json
index 8fced8db7c0..9b3c0118f63 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-root.json
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-root.json
@@ -8,4 +8,4 @@
       "name": "spring.root2.name"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/resources/org/springframework/boot/configurationsample/incremental/BarProperties.snippet b/spring-boot-tools/spring-boot-configuration-processor/src/test/resources/org/springframework/boot/configurationsample/incremental/BarProperties.snippet
index a9f7727aa60..57ce101c56f 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/test/resources/org/springframework/boot/configurationsample/incremental/BarProperties.snippet
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/resources/org/springframework/boot/configurationsample/incremental/BarProperties.snippet
@@ -6,4 +6,4 @@
 
 	public void setExtra(String extra) {
 		this.extra = extra;
-	}
\ No newline at end of file
+	}
diff --git a/spring-boot-tools/spring-boot-loader/src/test/resources/root/META-INF/MANIFEST.MF b/spring-boot-tools/spring-boot-loader/src/test/resources/root/META-INF/MANIFEST.MF
index e69de29bb2d..8b137891791 100644
--- a/spring-boot-tools/spring-boot-loader/src/test/resources/root/META-INF/MANIFEST.MF
+++ b/spring-boot-tools/spring-boot-loader/src/test/resources/root/META-INF/MANIFEST.MF
@@ -0,0 +1 @@
+
diff --git a/spring-boot/src/test/resources/activeprofilerepro-without-override.yml b/spring-boot/src/test/resources/activeprofilerepro-without-override.yml
index 3c0a9e151fe..2640af09e40 100644
--- a/spring-boot/src/test/resources/activeprofilerepro-without-override.yml
+++ b/spring-boot/src/test/resources/activeprofilerepro-without-override.yml
@@ -8,4 +8,4 @@ version: B
 ---
 spring.profiles: C
 version: C
----
\ No newline at end of file
+---
diff --git a/spring-boot/src/test/resources/custom-location.yml b/spring-boot/src/test/resources/custom-location.yml
index 60000ea2327..69a69615994 100644
--- a/spring-boot/src/test/resources/custom-location.yml
+++ b/spring-boot/src/test/resources/custom-location.yml
@@ -1 +1 @@
-foo: ${fooValue}
\ No newline at end of file
+foo: ${fooValue}
diff --git a/spring-boot/src/test/resources/testprofiles.yml b/spring-boot/src/test/resources/testprofiles.yml
index 74af5c33c15..cb6cde27e61 100644
--- a/spring-boot/src/test/resources/testprofiles.yml
+++ b/spring-boot/src/test/resources/testprofiles.yml
@@ -11,4 +11,4 @@ my:
 spring:
   profiles: other
 my:
-  property: fromotherprofile
\ No newline at end of file
+  property: fromotherprofile
diff --git a/spring-boot/src/test/resources/testprofilesdocument.yml b/spring-boot/src/test/resources/testprofilesdocument.yml
index 0093d6274c9..f74b31e0780 100644
--- a/spring-boot/src/test/resources/testprofilesdocument.yml
+++ b/spring-boot/src/test/resources/testprofilesdocument.yml
@@ -11,4 +11,4 @@ my:
 spring:
   profiles: other
 my:
-  property: fromotherprofile
\ No newline at end of file
+  property: fromotherprofile
diff --git a/spring-boot/src/test/resources/testsetmultiprofiles.yml b/spring-boot/src/test/resources/testsetmultiprofiles.yml
index 462f9d87856..348c27211cd 100644
--- a/spring-boot/src/test/resources/testsetmultiprofiles.yml
+++ b/spring-boot/src/test/resources/testsetmultiprofiles.yml
@@ -1,4 +1,4 @@
 ---
 spring:
   profiles:
-    active: dev,healthcheck
\ No newline at end of file
+    active: dev,healthcheck
diff --git a/spring-boot/src/test/resources/testsetmultiprofileslist.yml b/spring-boot/src/test/resources/testsetmultiprofileslist.yml
index 02deecd5bae..f5373631604 100644
--- a/spring-boot/src/test/resources/testsetmultiprofileslist.yml
+++ b/spring-boot/src/test/resources/testsetmultiprofileslist.yml
@@ -3,4 +3,4 @@ spring:
   profiles:
     active:
       - dev
-      - healthcheck
\ No newline at end of file
+      - healthcheck
diff --git a/spring-boot/src/test/resources/testsetmultiprofileswhitespace.yml b/spring-boot/src/test/resources/testsetmultiprofileswhitespace.yml
index 8b31dc528c5..cbce97c5104 100644
--- a/spring-boot/src/test/resources/testsetmultiprofileswhitespace.yml
+++ b/spring-boot/src/test/resources/testsetmultiprofileswhitespace.yml
@@ -1,4 +1,4 @@
 ---
 spring:
   profiles:
-    active: dev, healthcheck
\ No newline at end of file
+    active: dev, healthcheck
diff --git a/spring-boot/src/test/resources/testsetprofiles.yml b/spring-boot/src/test/resources/testsetprofiles.yml
index 4ec697ea3db..48c5f02a84c 100644
--- a/spring-boot/src/test/resources/testsetprofiles.yml
+++ b/spring-boot/src/test/resources/testsetprofiles.yml
@@ -8,4 +8,4 @@ my:
 spring:
   profiles: dev
 my:
-  property: fromdevprofile
\ No newline at end of file
+  property: fromdevprofile

From cd537155a91697c1f7df7cb6f975c7f00a244a66 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Mon, 3 Jun 2019 23:50:06 -0700
Subject: [PATCH 2/4] Use https for Thymeleaf xmlns:layout

---
 .../src/test/resources/templates/view.html                      | 2 +-
 .../src/main/resources/templates/hello.html                     | 2 +-
 .../src/main/resources/templates/layout.html                    | 2 +-
 .../src/main/resources/templates/layout.html                    | 2 +-
 .../src/main/resources/templates/messages/form.html             | 2 +-
 .../src/main/resources/templates/messages/list.html             | 2 +-
 .../src/main/resources/templates/messages/view.html             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/spring-boot-autoconfigure/src/test/resources/templates/view.html b/spring-boot-autoconfigure/src/test/resources/templates/view.html
index accdaf1ea19..4ff0e133524 100644
--- a/spring-boot-autoconfigure/src/test/resources/templates/view.html
+++ b/spring-boot-autoconfigure/src/test/resources/templates/view.html
@@ -1,4 +1,4 @@
-<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout" layout:decorator="layout">
+<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://www.ultraq.net.nz/web/thymeleaf/layout" layout:decorator="layout">
   <head>
     <title layout:fragment="title">Content</title>
   </head>
diff --git a/spring-boot-samples/spring-boot-sample-devtools/src/main/resources/templates/hello.html b/spring-boot-samples/spring-boot-sample-devtools/src/main/resources/templates/hello.html
index 50c0bdb7c52..76b2c65e19a 100644
--- a/spring-boot-samples/spring-boot-sample-devtools/src/main/resources/templates/hello.html
+++ b/spring-boot-samples/spring-boot-sample-devtools/src/main/resources/templates/hello.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html xmlns:th="https://www.thymeleaf.org"
-	xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout"
+	xmlns:layout="https://www.ultraq.net.nz/web/thymeleaf/layout"
 	layout:decorator="layout">
 <head>
 <title>Hello</title>
diff --git a/spring-boot-samples/spring-boot-sample-devtools/src/main/resources/templates/layout.html b/spring-boot-samples/spring-boot-sample-devtools/src/main/resources/templates/layout.html
index 34ffeefca6c..704addd7cb5 100644
--- a/spring-boot-samples/spring-boot-sample-devtools/src/main/resources/templates/layout.html
+++ b/spring-boot-samples/spring-boot-sample-devtools/src/main/resources/templates/layout.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html xmlns:th="https://www.thymeleaf.org"
-	xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout">
+	xmlns:layout="https://www.ultraq.net.nz/web/thymeleaf/layout">
 <head>
 <title>Layout</title>
 <link rel="stylesheet" th:href="@{/css/application.css}" />
diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/layout.html b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/layout.html
index c2fd11c8368..8ad5e323c14 100644
--- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/layout.html
+++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/layout.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html xmlns:th="https://www.thymeleaf.org"
-	xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout">
+	xmlns:layout="https://www.ultraq.net.nz/web/thymeleaf/layout">
 <head>
 <title>Layout</title>
 <link rel="stylesheet" th:href="@{/css/bootstrap.min.css}"
diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/form.html b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/form.html
index 608de026984..b704eac67f5 100644
--- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/form.html
+++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/form.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html xmlns:th="https://www.thymeleaf.org"
-	xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout"
+	xmlns:layout="https://www.ultraq.net.nz/web/thymeleaf/layout"
 	layout:decorator="layout">
 <head>
 <title>Messages : Create</title>
diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/list.html b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/list.html
index cd7e9a1828d..d50382825ce 100644
--- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/list.html
+++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/list.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html xmlns:th="https://www.thymeleaf.org"
-	xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout"
+	xmlns:layout="https://www.ultraq.net.nz/web/thymeleaf/layout"
 	layout:decorator="layout">
 <head>
 <title>Messages : View all</title>
diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/view.html b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/view.html
index 5128aa4b9a7..85493452239 100644
--- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/view.html
+++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/view.html
@@ -1,5 +1,5 @@
 <html xmlns:th="https://www.thymeleaf.org"
-	xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout"
+	xmlns:layout="https://www.ultraq.net.nz/web/thymeleaf/layout"
 	layout:decorator="layout">
 <head>
 <title>Messages : View</title>

From 72268a266be45e59dc17f492c46513c7a65b35a4 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Mon, 3 Jun 2019 23:50:37 -0700
Subject: [PATCH 3/4] Switch livereload links to https

---
 .../boot/devtools/livereload/LiveReloadServer.java             | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java
index 0e7900270be..0e6f8872dbc 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java
@@ -36,11 +36,10 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.util.Assert;
 
 /**
- * A <a href="http://livereload.com">livereload</a> server.
+ * A <a href="https://github.com/livereload">livereload</a> server.
  *
  * @author Phillip Webb
  * @since 1.3.0
- * @see <a href="http://livereload.com">livereload.com</a>
  */
 public class LiveReloadServer {
 

From 80d8a5cfa24cf8269b1593d58b62eb9d177c7045 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Mon, 3 Jun 2019 23:51:08 -0700
Subject: [PATCH 4/4] Add nohttp checkstyle rule

Closes gh-16682
---
 spring-boot-parent/pom.xml                             | 10 +++++++++-
 .../src/checkstyle/checkstyle-suppressions.xml         |  6 ++++--
 spring-boot-parent/src/checkstyle/checkstyle.xml       |  3 +++
 spring-boot-parent/src/checkstyle/nohttp-whitelist.txt |  1 +
 spring-boot-samples/pom.xml                            |  8 ++++++++
 5 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 spring-boot-parent/src/checkstyle/nohttp-whitelist.txt

diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml
index 2e7d3df7640..56b663d3811 100644
--- a/spring-boot-parent/pom.xml
+++ b/spring-boot-parent/pom.xml
@@ -17,7 +17,7 @@
 		<url>https://www.spring.io</url>
 	</organization>
 	<properties>
-		<main.basedir>..</main.basedir>
+		<main.basedir>${basedir}/..</main.basedir>
 		<disable.checks>false</disable.checks>
 		<java.version>1.6</java.version>
 		<aether.version>1.0.2.v20150114</aether.version>
@@ -25,6 +25,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.version>3.1.1</maven.version>
 		<spring-javaformat.version>0.0.9</spring-javaformat.version>
+		<nohttp-checkstyle.version>0.0.1.RELEASE</nohttp-checkstyle.version>
 	</properties>
 	<scm>
 		<url>https://github.com/spring-projects/spring-boot</url>
@@ -318,6 +319,11 @@
 							<artifactId>spring-javaformat-checkstyle</artifactId>
 							<version>${spring-javaformat.version}</version>
 						</dependency>
+						<dependency>
+							<groupId>io.spring.nohttp</groupId>
+							<artifactId>nohttp-checkstyle</artifactId>
+							<version>${nohttp-checkstyle.version}</version>
+						</dependency>
 					</dependencies>
 				</plugin>
 				<plugin>
@@ -533,6 +539,8 @@
 							<configLocation>src/checkstyle/checkstyle.xml</configLocation>
 							<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
 							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
+							<resourceIncludes>**\/*.*</resourceIncludes>
 						</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 94b7e7e62c5..38fbb7d737c 100644
--- a/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
+++ b/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE suppressions PUBLIC
-    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
-    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
+	"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+	"https://checkstyle.org/dtds/suppressions_1_2.dtd">
 <suppressions>
+<suppress files="[\\/]target[\\/]" checks=".*" />
+	<suppress files=".+\.[jar|git|ico|p12]" checks=".*" />
 	<suppress files="SpringApplicationTests\.java" checks="FinalClass" />
 	<suppress files=".+Configuration\.java" checks="HideUtilityClassConstructor" />
 	<suppress files=".+Application\.java" checks="HideUtilityClassConstructor" />
diff --git a/spring-boot-parent/src/checkstyle/checkstyle.xml b/spring-boot-parent/src/checkstyle/checkstyle.xml
index 7eba2cff9e0..9bc8ad31b55 100644
--- a/spring-boot-parent/src/checkstyle/checkstyle.xml
+++ b/spring-boot-parent/src/checkstyle/checkstyle.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "https://checkstyle.org/dtds/configuration_1_2.dtd">
 <module name="com.puppycrawl.tools.checkstyle.Checker">
+	<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck">
+		<property name="whitelistFileName" value="${main.basedir}/spring-boot-parent/src/checkstyle/nohttp-whitelist.txt"/>
+	</module>
 	<module name="io.spring.javaformat.checkstyle.SpringChecks" />
 	<module name="com.puppycrawl.tools.checkstyle.TreeWalker">
 		<module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">
diff --git a/spring-boot-parent/src/checkstyle/nohttp-whitelist.txt b/spring-boot-parent/src/checkstyle/nohttp-whitelist.txt
new file mode 100644
index 00000000000..79936fb7c79
--- /dev/null
+++ b/spring-boot-parent/src/checkstyle/nohttp-whitelist.txt
@@ -0,0 +1 @@
+^http://livereload.com/protocols/official-7$
diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml
index 061c7a8c36b..a771fbc9be0 100644
--- a/spring-boot-samples/pom.xml
+++ b/spring-boot-samples/pom.xml
@@ -20,6 +20,7 @@
 		<main.basedir>${basedir}/..</main.basedir>
 		<java.version>1.8</java.version>
 		<spring-javaformat.version>0.0.9</spring-javaformat.version>
+		<nohttp-checkstyle.version>0.0.1.RELEASE</nohttp-checkstyle.version>
 		<disable.checks>false</disable.checks>
 	</properties>
 	<modules>
@@ -155,6 +156,11 @@
 						<artifactId>spring-javaformat-checkstyle</artifactId>
 						<version>${spring-javaformat.version}</version>
 					</dependency>
+					<dependency>
+						<groupId>io.spring.nohttp</groupId>
+						<artifactId>nohttp-checkstyle</artifactId>
+						<version>${nohttp-checkstyle.version}</version>
+					</dependency>
 				</dependencies>
 				<executions>
 					<execution>
@@ -165,6 +171,8 @@
 							<configLocation>../spring-boot-parent/src/checkstyle/checkstyle.xml</configLocation>
 							<suppressionsLocation>../spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
 							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
+							<resourceIncludes>**\/*.*</resourceIncludes>
 						</configuration>
 						<goals>
 							<goal>check</goal>