Merge branch '2.1.x'

Author: philwebb

ci/images/get-jdk-url.sh

@@ -14,4 +14,4 @@ case "$1" in
 	*)
 		echo $"Unknown java version"
 		exit 1
-esac
+esac

ci/scripts/detect-jdk-updates.sh

@@ -43,4 +43,4 @@ if [[ ${existing_jdk_issues} = "" ]]; then
 	POST "https://api.github.com/repos/${GITHUB_ORGANIZATION}/${GITHUB_REPO}/issues" > /dev/null || { echo "Failed to create issue" >&2; exit 1; }
 else
 	echo "Issue already exists."
-fi
+fi

ci/tasks/build-pr-project.yml

@@ -8,4 +8,4 @@ caches:
 - path: maven
 - path: gradle
 run:
-  path: git-repo/ci/scripts/build-project.sh
+  path: git-repo/ci/scripts/build-project.sh

idea/codeStyleConfig.xml

@@ -125,4 +125,4 @@
 			<option name="USE_TAB_CHARACTER" value="true"/>
 		</indentOptions>
 	</codeStyleSettings>
-</code_scheme>
+</code_scheme>

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-autoconfigure/src/test/resources/public-key-location

@@ -3,4 +3,4 @@ MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdlatRjRjogo3WojgGHFHYLugd
 UWAY9iR3fy4arWNA1KoS8kVw33cJibXr8bvwUAUparCwlvdbH6dvEOfou0/gCFQs
 HUfQrSDv+MuSUMAe8jzKE4qW+jK+xQU9a03GUnKHkkle+Q0pX/g6jXZ7r1/xAK5D
 o2kQ+X5xK9cipRgEKwIDAQAB
------END PUBLIC KEY-----
+-----END PUBLIC KEY-----

spring-boot-project/spring-boot-cli/src/main/executablecontent/bin/spring

@@ -113,4 +113,4 @@ if $cygwin; then
 fi
 
 IFS=" " read -r -a javaOpts <<< "$JAVA_OPTS"
-"${JAVA_HOME}/bin/java" "${javaOpts[@]}" -cp "$CLASSPATH" org.springframework.boot.loader.JarLauncher "$@"
+"${JAVA_HOME}/bin/java" "${javaOpts[@]}" -cp "$CLASSPATH" org.springframework.boot.loader.JarLauncher "$@"

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-dependencies/src/main/xslt/post-process-flattened-pom.xsl

@@ -28,4 +28,4 @@
 	<xsl:template match="/m:project/m:properties/m:revision" />
 	<xsl:template match="/m:project/m:properties/m:main.basedir" />
 	<xsl:template match="/m:project/m:distributionManagement" />
-</xsl:stylesheet>
+</xsl:stylesheet>

spring-boot-project/spring-boot-dependencies/src/main/xslt/single-project.xsl

@@ -3,4 +3,4 @@
 		<xsl:copy-of select="projects/*[1]" />
 		<xsl:copy-of select="*[local-name()='project']" />
 	</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>

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-starters/src/main/assembly/starter-poms-assembly.xml

@@ -19,4 +19,4 @@
 			</sources>
 		</moduleSet>
 	</moduleSets>
-</assembly>
+</assembly>

spring-boot-project/spring-boot-test/src/main/kotlin/org/springframework/boot/test/web/client/TestRestTemplateExtensions.kt

@@ -274,4 +274,4 @@ inline fun <reified T : Any> TestRestTemplate.exchange(url: URI, method: HttpMet
  */
 @Throws(RestClientException::class)
 inline fun <reified T : Any> TestRestTemplate.exchange(requestEntity: RequestEntity<*>): ResponseEntity<T> =
-		exchange(requestEntity, object : ParameterizedTypeReference<T>() {})
+		exchange(requestEntity, object : ParameterizedTypeReference<T>() {})

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

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-kotlin-module/src/main/kotlin/org/test/SampleApplication.kt

@@ -19,4 +19,4 @@ package org.test;
 
 fun main(args: Array<String>) {
 
-}
+}

spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/context/properties/KotlinConfigurationPropertiesBeanRegistrarTests.kt

@@ -72,4 +72,4 @@ class KotlinConfigurationPropertiesBeanRegistrarTests {
 
 	}
 
-}
+}

spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/context/properties/bind/KotlinConstructorParametersBinderTests.kt

@@ -205,4 +205,4 @@ class KotlinConstructorParametersBinderTests {
 									val stringValue: String = "my data",
 									val enumValue: ExampleEnum = ExampleEnum.BAR_BAZ)
 
-}
+}

spring-boot-samples/spring-boot-sample-oauth2-resource-server/src/main/resources/application.yml

@@ -4,4 +4,4 @@ spring:
       resource:
         jwt:
         # To run the application, replace this with a valid JWK Set URI
-          jwk-set-uri: https://example.com/oauth2/default/v1/keys
+          jwk-set-uri: https://example.com/oauth2/default/v1/keys

spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/main/resources/application.yml

@@ -22,4 +22,4 @@ spring:
             client-secret: ${YAHOO-CLIENT-SECRET}
         provider:
           yahoo-oidc:
-            issuer-uri: https://api.login.yahoo.com
+            issuer-uri: https://api.login.yahoo.com

spring-boot-samples/spring-boot-sample-reactive-oauth2-resource-server/src/main/resources/application.yml

@@ -4,4 +4,4 @@ spring:
       resourceserver:
         jwt:
           # To run the application, replace this with a valid JWK Set URI
-          jwk-set-uri: https://example.com/oauth2/default/v1/keys
+          jwk-set-uri: https://example.com/oauth2/default/v1/keys

spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/index.html

@@ -3,4 +3,4 @@
 <h1>Hello</h1>
 Hello World!
 </body>
-</html>
+</html>

spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/main/webapp/WEB-INF/glassfish-web.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glassfish-web-app error-url="">
 	<class-loader delegate="false"/>
-</glassfish-web-app>
+</glassfish-web-app>

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="[\\/]target[\\/]" checks=".*" />
-	<suppress files=".+\.[jar|git|ico|p12]" checks=".*" />
+	<suppress files="\.DS_Store" checks=".*" />
+	<suppress files="[\\/]\.flattened-pom\.xml" checks=".*" />
+	<suppress files="[\\/]transaction-logs[\\/]" checks=".*" />
+	<suppress files="[\\/]target[\\/]" 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.*