Merge branch '1.5.x' into 2.0.x

pom.xml

@@ -25,6 +25,7 @@
 			</activation>
 			<properties>
 				<spring-javaformat.version>0.0.9</spring-javaformat.version>
+				<nohttp-checkstyle.version>0.0.1.RELEASE</nohttp-checkstyle.version>
 			</properties>
 			<build>
 				<plugins>
@@ -43,6 +44,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>
@@ -54,6 +60,7 @@
 									<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
 									<includeTestSourceDirectory>true</includeTestSourceDirectory>
 									<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
+									<resourceIncludes>**\/*.*</resourceIncludes>
 								</configuration>
 								<goals>
 									<goal>check</goal>

spring-boot-project/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' )
+  X-ORIGIN 'Managing Schema Document' )

spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.ftl

@@ -1 +1 @@
-custom
+custom

spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.tpl

@@ -1 +1 @@
-yield "custom"
+yield "custom"

spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.vm

@@ -1 +1 @@
-custom
+custom

spring-boot-project/spring-boot-autoconfigure/src/test/resources/data.sql

@@ -1 +1 @@
-INSERT INTO BAR VALUES (1, 'Andy');
+INSERT INTO BAR VALUES (1, 'Andy');

spring-boot-project/spring-boot-autoconfigure/src/test/resources/ehcache3.xml

@@ -23,4 +23,4 @@
 		</expiry>
 	</cache>
 
-</config>
+</config>

spring-boot-project/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>
+</configuration>

spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo.html

@@ -1 +1 @@
-Hello {{World}}
+Hello {{World}}

spring-boot-project/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>
+</html>

spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/layout.html

@@ -12,4 +12,4 @@
 	</div>
 	<div class="jumbotron">{{#include}}{{body}}{{/include}}</div>
 </body>
-</html>
+</html>

spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/partial.html

@@ -12,4 +12,4 @@
 	</div>
 	<div class="jumbotron">{{>content}}</div>
 </body>
-</html>
+</html>

spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml

@@ -16,4 +16,4 @@
 		</join>
 	</network>
 
-</hazelcast>
+</hazelcast>

spring-boot-project/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),
-);
+);

spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/data.sql

@@ -1 +1 @@
-INSERT INTO FOO VALUES (1, 'Andy');
+INSERT INTO FOO VALUES (1, 'Andy');

spring-boot-project/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, 'ばー');
+INSERT INTO BAR(id, name) VALUES (2, 'ばー');

spring-boot-project/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),
-);
+);

spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema.sql

@@ -1,4 +1,4 @@
 CREATE TABLE BAR (
   id         INTEGER IDENTITY PRIMARY KEY,
   name VARCHAR(30),
-);
+);

spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/data-dialect.html

@@ -1 +1 @@
-<html><body data:foo="${foo}"></body></html>
+<html><body data:foo="${foo}"></body></html>

spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.ftl

@@ -1 +1 @@
-home
+home

spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.html

@@ -1 +1 @@
-<html><body th:text="${foo}">Home</body></html>
+<html><body th:text="${foo}">Home</body></html>

spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.vm

@@ -1 +1 @@
-home
+home

spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/java8time-dialect.html

@@ -1 +1 @@
-<html><body th:text="${#temporals.create('2015','11','24')}"></body></html>
+<html><body th:text="${#temporals.create('2015','11','24')}"></body></html>

spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/layout.html

@@ -11,4 +11,4 @@
       </div>
     </div>
   </body>
-</html>
+</html>

spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.ftl

@@ -1 +1 @@
-Message: ${greeting}
+Message: ${greeting}

spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.html

@@ -1 +1 @@
-<html><body>Message: <span th:text="${greeting}">Hello</span></body></html>
+<html><body>Message: <span th:text="${greeting}">Hello</span></body></html>

spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.vm

@@ -1 +1 @@
-Message: ${greeting}
+Message: ${greeting}

spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.ftl

@@ -1 +1 @@
-prefixed
+prefixed

spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.tpl

@@ -1 +1 @@
-yield "prefixed"
+yield "prefixed"

spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.vm

@@ -1 +1 @@
-prefixed
+prefixed

spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/suffixed.freemarker

@@ -1 +1 @@
-suffixed
+suffixed

spring-boot-project/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>
@@ -7,4 +7,4 @@
     	<span th:text="${foo}">foo</span>
     </div>
   </body>
-</html>
+</html>

spring-boot-project/spring-boot-cli/src/test/resources/.m2/settings.xml

@@ -30,4 +30,4 @@
 		</proxy>
 	</proxies>
 
-</settings>
+</settings>

spring-boot-project/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>
+</settingsSecurity>

spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings.xml

@@ -28,4 +28,4 @@
 		</proxy>
 	</proxies>
 
-</settings>
+</settings>

spring-boot-project/spring-boot-cli/src/test/resources/schema-all.sql

@@ -1,4 +1,4 @@
 CREATE TABLE FOO (
   id         INTEGER IDENTITY PRIMARY KEY,
   name VARCHAR(30),
-);
+);

spring-boot-project/spring-boot-cli/src/test/resources/templates/home.html

@@ -22,4 +22,4 @@
 			2012 2:17:16 PM CDT</div>
 	</div>
 </body>
-</html>
+</html>

spring-boot-project/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 {
 

spring-boot-project/spring-boot-docs/src/test/resources/com/example/myapp/config.yml

@@ -1,3 +1,3 @@
 test:
   foo:
-    bar: value
+    bar: value

spring-boot-project/spring-boot-test-autoconfigure/src/test/resources/org/springframework/boot/test/autoconfigure/jdbc/schema.sql

@@ -1 +1 @@
-create table example (id int, name varchar);
+create table example (id int, name varchar);

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-bar.json

@@ -62,4 +62,4 @@
       ]
     }
   ]
-}
+}

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-deprecated.json

@@ -35,4 +35,4 @@
       }
     }
 	]
-}
+}

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-empty.json

@@ -1,3 +1,3 @@
 {
   "foo": "bar"
-}
+}

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo.json

@@ -56,4 +56,4 @@
       ]
     }
   ]
-}
+}

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo2.json

@@ -20,4 +20,4 @@
       "sourceType": "org.acme.Foo2"
     }
   ]
-}
+}

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-invalid.json

@@ -5,4 +5,4 @@
       "sourceType": "org.acme.Invalid"
     }
   ]
-}
+}

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-map.json

@@ -76,4 +76,4 @@
       ]
     }
   ]
-}
+}

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-root.json

@@ -8,4 +8,4 @@
       "name": "spring.root2.name"
     }
   ]
-}
+}

spring-boot-project/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;
-	}
+	}

spring-boot-project/spring-boot/src/test/resources/activeprofilerepro-without-override.yml

@@ -8,4 +8,4 @@ version: B
 ---
 spring.profiles: C
 version: C
----
+---

spring-boot-project/spring-boot/src/test/resources/custom-location.yml

@@ -1 +1 @@
-foo: ${fooValue}
+foo: ${fooValue}

spring-boot-project/spring-boot/src/test/resources/testprofiles.yml

@@ -11,4 +11,4 @@ my:
 spring:
   profiles: other
 my:
-  property: fromotherprofile
+  property: fromotherprofile

spring-boot-project/spring-boot/src/test/resources/testprofilesdocument.yml

@@ -11,4 +11,4 @@ my:
 spring:
   profiles: other
 my:
-  property: fromotherprofile
+  property: fromotherprofile

spring-boot-project/spring-boot/src/test/resources/testsetmultiprofiles.yml

@@ -1,4 +1,4 @@
 ---
 spring:
   profiles:
-    active: dev,healthcheck
+    active: dev,healthcheck

spring-boot-project/spring-boot/src/test/resources/testsetmultiprofileslist.yml

@@ -3,4 +3,4 @@ spring:
   profiles:
     active:
       - dev
-      - healthcheck
+      - healthcheck

spring-boot-project/spring-boot/src/test/resources/testsetmultiprofileswhitespace.yml

@@ -1,4 +1,4 @@
 ---
 spring:
   profiles:
-    active: dev, healthcheck
+    active: dev, healthcheck

spring-boot-project/spring-boot/src/test/resources/testsetprofiles.yml

@@ -8,4 +8,4 @@ my:
 spring:
   profiles: dev
 my:
-  property: fromdevprofile
+  property: fromdevprofile

spring-boot-samples/spring-boot-sample-actuator-log4j2/src/main/resources/log4j2.xml

@@ -18,4 +18,4 @@
             <AppenderRef ref="Console"/>
         </Root>
     </Loggers>
-</Configuration>
+</Configuration>

spring-boot-samples/spring-boot-sample-cache/src/main/resources/ehcache3.xml

@@ -11,4 +11,4 @@
 		<jsr107:mbeans enable-statistics="true"/>
 	</cache>
 
-</config>
+</config>

spring-boot-samples/spring-boot-sample-flyway/src/main/resources/db/migration/V1__init.sql

@@ -6,4 +6,4 @@ CREATE TABLE PERSON (
 
 create sequence person_sequence start with 1 increment by 1;
 
-insert into PERSON (first_name, last_name) values ('Dave', 'Syer');
+insert into PERSON (first_name, last_name) values ('Dave', 'Syer');

spring-boot-samples/spring-boot-sample-jooq/src/main/resources/reset.sql

@@ -1 +1 @@
-DROP ALL OBJECTS;
+DROP ALL OBJECTS;

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)
+insert into note_tags(notes_id, tags_id) values (4, 3)

spring-boot-samples/spring-boot-sample-profile/application.yml

@@ -1 +1 @@
-hello: Bonjour
+hello: Bonjour

spring-boot-samples/spring-boot-sample-profile/src/main/resources/application.yml

@@ -4,4 +4,4 @@ name: Phil
 
 spring:
   profiles: goodbye,dev
-name: Everyone
+name: Everyone

spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/login.html

@@ -31,4 +31,4 @@
 		</div>
 	</div>
 </body>
-</html>
+</html>

spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/login.html

@@ -31,4 +31,4 @@
 		</div>
 	</div>
 </body>
-</html>
+</html>

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', '{noop}user', true);
 
-insert into authorities (username, authority) values ('user', 'ROLE_ADMIN');
+insert into authorities (username, authority) values ('user', 'ROLE_ADMIN');

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)
-);
+);

spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/login.html

@@ -31,4 +31,4 @@
 		</div>
 	</div>
 </body>
-</html>
+</html>

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)
-);
+);

spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/login.html

@@ -31,4 +31,4 @@
 		</div>
 	</div>
 </body>
-</html>
+</html>

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>
+</xs:schema>

spring-boot-tests/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"
+[[ -s /test-service/log/spring-boot-app.log ]] && echo "Log written"

spring-boot-tests/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
+ls -al /test-service/log/spring-boot-app.log

spring-boot-tests/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
+ls -al /test-service/log/spring-boot-app.log

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" />

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}/src/checkstyle/nohttp-whitelist.txt"/>
+	</module>
 	<module name="io.spring.javaformat.checkstyle.SpringChecks" />
 	<module name="com.puppycrawl.tools.checkstyle.TreeWalker">
 		<module

src/checkstyle/nohttp-whitelist.txt

@@ -0,0 +1 @@
+^http://livereload.com/protocols/official-7$