Merge branch '2.0.x' into 2.1.x

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>