Merge branch '1.5.x' into 2.0.x

7fc01971 · Phillip Webb · 90468c4d · d548c5ed · 7fc01971 · 7fc01971
Commit 7fc01971 authored Jun 04, 2019 by Phillip Webb
24 changed files
--- a/ci/tasks/build-pr-project.yml
+++ b/ci/tasks/build-pr-project.yml
--- 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

+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
--- 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
--- 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
--- 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
--- 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
+
--- a/spring-boot-project/spring-boot-test/src/test/resources/public/inpublic
+++ b/spring-boot-project/spring-boot-test/src/test/resources/public/inpublic
+
--- a/spring-boot-project/spring-boot-test/src/test/resources/resources/inresources
+++ b/spring-boot-project/spring-boot-test/src/test/resources/resources/inresources
+
--- a/spring-boot-project/spring-boot-test/src/test/resources/static/instatic
+++ b/spring-boot-project/spring-boot-test/src/test/resources/static/instatic
+
--- a/spring-boot-project/spring-boot-test/src/test/webapp/inwebapp
+++ b/spring-boot-project/spring-boot-test/src/test/webapp/inwebapp
+
--- 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
--- 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
--- 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
-^http://livereload.com/protocols/official-7$
+^http://livereload.com/protocols/official-7.*
+^http://exslt.org/common.*