Merge branch '1.5.x' into 2.0.x

6 years ago · 7fc01971ed
parent 90468c4d53 d548c5ed31
commit 7fc01971ed
24 changed files with 31 additions and 10 deletions
--- a/ci/tasks/build-pr-project.yml
+++ b/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
--- a/pom.xml
+++ b/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>
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html
@ -1 +1,2 @@

+
--- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/excluded
+++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/excluded
@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/fileA
+++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/fileA
@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/fileC
+++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/fileC
@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/nested/fileB
+++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/nested/fileB
@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/fileD
+++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/fileD
@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/three
+++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/three
@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/bravo/fileE
+++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/bravo/fileE
@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/fileF
+++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/fileF
@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-dependencies/src/main/xslt/post-process-flattened-pom.xsl
+++ b/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>
--- a/spring-boot-project/spring-boot-dependencies/src/main/xslt/single-project.xsl
+++ b/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>
--- a/spring-boot-project/spring-boot-starters/src/main/assembly/starter-poms-assembly.xml
+++ b/spring-boot-project/spring-boot-starters/src/main/assembly/starter-poms-assembly.xml
@ -19,4 +19,4 @@
 			</sources>
 		</moduleSet>
 	</moduleSets>
-</assembly>
+</assembly>
--- a/spring-boot-project/spring-boot-test/src/main/kotlin/org/springframework/boot/test/web/client/TestRestTemplateExtensions.kt
+++ b/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>() {})
--- a/spring-boot-project/spring-boot-test/src/test/resources/META-INF/resources/inmetainfresources
+++ b/spring-boot-project/spring-boot-test/src/test/resources/META-INF/resources/inmetainfresources
@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-test/src/test/resources/public/inpublic
+++ b/spring-boot-project/spring-boot-test/src/test/resources/public/inpublic
@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-test/src/test/resources/resources/inresources
+++ b/spring-boot-project/spring-boot-test/src/test/resources/resources/inresources
@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-test/src/test/resources/static/instatic
+++ b/spring-boot-project/spring-boot-test/src/test/resources/static/instatic
@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-test/src/test/webapp/inwebapp
+++ b/spring-boot-project/spring-boot-test/src/test/webapp/inwebapp
@ -0,0 +1 @@
+
--- a/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/index.html
+++ b/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/index.html
@ -3,4 +3,4 @@
 <h1>Hello</h1>
 Hello World!
 </body>
-</html>
+</html>
--- a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/main/webapp/WEB-INF/glassfish-web.xml
+++ b/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>
--- a/src/checkstyle/checkstyle-suppressions.xml
+++ b/src/checkstyle/checkstyle-suppressions.xml
@ -3,8 +3,12 @@
 	"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
 	"https://checkstyle.org/dtds/suppressions_1_2.dtd">
 <suppressions>
-<suppress files="[\\/]target[\\/]" 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]" 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" />
--- a/src/checkstyle/nohttp-whitelist.txt
+++ b/src/checkstyle/nohttp-whitelist.txt
@ -1 +1,2 @@
-^http://livereload.com/protocols/official-7$
+^http://livereload.com/protocols/official-7.*
+^http://exslt.org/common.*