Skip to content

Commit 7fc0197

Browse files
philwebbphilwebb
committed
Merge branch '1.5.x' into 2.0.x
2 parents 90468c4 + d548c5e commit 7fc0197

File tree

24 files changed

+31
-10
lines changed

24 files changed

+31
-10
lines changed

‎ci/tasks/build-pr-project.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ caches:
88
- path: maven
99
- path: gradle
1010
run:
11-
path: git-repo/ci/scripts/build-project.sh
11+
path: git-repo/ci/scripts/build-project.sh

‎pom.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@
6060
<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
6161
<includeTestSourceDirectory>true</includeTestSourceDirectory>
6262
<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
63-
<resourceIncludes>**\/*.*</resourceIncludes>
63+
<sourceDirectories>./</sourceDirectories>
64+
<includes>**/*</includes>
65+
<excludes>.git/**/*,target/**/*</excludes>
6466
</configuration>
6567
<goals>
6668
<goal>check</goal>

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

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11

2+

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎spring-boot-project/spring-boot-dependencies/src/main/xslt/post-process-flattened-pom.xsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@
2828
<xsl:template match="/m:project/m:properties/m:revision" />
2929
<xsl:template match="/m:project/m:properties/m:main.basedir" />
3030
<xsl:template match="/m:project/m:distributionManagement" />
31-
</xsl:stylesheet>
31+
</xsl:stylesheet>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
<xsl:copy-of select="projects/*[1]" />
44
<xsl:copy-of select="*[local-name()='project']" />
55
</xsl:template>
6-
</xsl:stylesheet>
6+
</xsl:stylesheet>

‎spring-boot-project/spring-boot-starters/src/main/assembly/starter-poms-assembly.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
</sources>
2020
</moduleSet>
2121
</moduleSets>
22-
</assembly>
22+
</assembly>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -274,4 +274,4 @@ inline fun <reified T : Any> TestRestTemplate.exchange(url: URI, method: HttpMet
274274
*/
275275
@Throws(RestClientException::class)
276276
inline fun <reified T : Any> TestRestTemplate.exchange(requestEntity: RequestEntity<*>): ResponseEntity<T> =
277-
exchange(requestEntity, object : ParameterizedTypeReference<T>() {})
277+
exchange(requestEntity, object : ParameterizedTypeReference<T>() {})

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
<h1>Hello</h1>
44
Hello World!
55
</body>
6-
</html>
6+
</html>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<glassfish-web-app error-url="">
33
<class-loader delegate="false"/>
4-
</glassfish-web-app>
4+
</glassfish-web-app>

‎src/checkstyle/checkstyle-suppressions.xml

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
44
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
55
<suppressions>
6-
<suppress files="[\\/]target[\\/]" checks=".*" />
6+
<suppress files="[\\/]\.flattened-pom\.xml" checks=".*" />
7+
<suppress files="[\\/]transaction-logs[\\/]" checks=".*" />
8+
<suppress files="[\\/]target[\\/]" checks=".*" />
9+
<suppress files="[\\/]build.log" checks=".*" />
710
<suppress files=".+\.[jar|git|ico|p12]" checks=".*" />
11+
<suppress files="eclipse[\\/]spring-boot-project.setup" checks="NoHttp"/>
812
<suppress files="SpringApplicationTests\.java" checks="FinalClass" />
913
<suppress files=".+Configuration\.java" checks="HideUtilityClassConstructor" />
1014
<suppress files=".+Application\.java" checks="HideUtilityClassConstructor" />

‎src/checkstyle/nohttp-whitelist.txt

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

0 commit comments

Comments
 (0)