Merge branch '2.1.x'

pom.xml

@@ -60,7 +60,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>

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

@@ -1 +1,2 @@
 
+

spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/excluded

@@ -0,0 +1 @@
+

spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/fileA

@@ -0,0 +1 @@
+

spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/fileC

@@ -0,0 +1 @@
+

spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/nested/fileB

@@ -0,0 +1 @@
+

spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/fileD

@@ -0,0 +1 @@
+

spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/three

@@ -0,0 +1 @@
+

spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/bravo/fileE

@@ -0,0 +1 @@
+

spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/fileF

@@ -0,0 +1 @@
+

spring-boot-project/spring-boot-starters/spring-boot-starter-rsocket/pom.xml

@@ -1,22 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2012-2019 the original author or authors.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      https://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>

spring-boot-project/spring-boot-test/src/test/resources/META-INF/resources/inmetainfresources

@@ -0,0 +1 @@
+

spring-boot-project/spring-boot-test/src/test/resources/public/inpublic

@@ -0,0 +1 @@
+

spring-boot-project/spring-boot-test/src/test/resources/resources/inresources

@@ -0,0 +1 @@
+

spring-boot-project/spring-boot-test/src/test/resources/static/instatic

@@ -0,0 +1 @@
+

spring-boot-project/spring-boot-test/src/test/webapp/inwebapp

@@ -0,0 +1 @@
+

src/checkstyle/checkstyle-suppressions.xml

@@ -3,8 +3,13 @@
 		"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
 		"https://checkstyle.org/dtds/suppressions_1_2.dtd">
 <suppressions>
+	<suppress files="\.DS_Store" checks=".*" />
+	<suppress files="[\\/]\.flattened-pom\.xml" checks=".*" />
+	<suppress files="[\\/]transaction-logs[\\/]" checks=".*" />
 	<suppress files="[\\/]target[\\/]" checks=".*" />
-	<suppress files=".+\.[jar|git|ico|p12]" checks=".*" />
+	<suppress files="[\\/]build.log" checks=".*" />
+	<suppress files=".+\.[jar|git|ico|p12|svg|png]" checks=".*" />
+	<suppress files="eclipse[\\/]spring-boot-project.setup" checks="NoHttp"/>
 	<suppress files="SpringApplicationTests\.java" checks="FinalClass" />
 	<suppress files=".+Configuration\.java" checks="HideUtilityClassConstructor" />
 	<suppress files=".+Application\.java" checks="HideUtilityClassConstructor" />

src/checkstyle/nohttp-whitelist.txt

@@ -1 +1,2 @@
-^http://livereload.com/protocols/official-7$
+^http://livereload.com/protocols/official-7.*
+^http://exslt.org/common.*