fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '1.5.x' into 2.0.x

Browse Source
This commit is contained in:
Phillip Webb 2019-06-04 14:20:25 -07:00
commit 7fc01971ed
24 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -60,7 +60,9 @@
<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation> <suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory> <includeTestSourceDirectory>true</includeTestSourceDirectory>
<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion> <propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
<resourceIncludes>**\/*.*</resourceIncludes> <sourceDirectories>./</sourceDirectories>
<includes>**/*</includes>
<excludes>.git/**/*,target/**/*</excludes>
</configuration> </configuration>
<goals> <goals>
<goal>check</goal> <goal>check</goal>

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

@ -1 +1,2 @@

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

@ -0,0 +1 @@

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

@ -0,0 +1 @@

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

@ -0,0 +1 @@

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

@ -0,0 +1 @@

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

@ -0,0 +1 @@

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

@ -0,0 +1 @@

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

@ -0,0 +1 @@

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

@ -0,0 +1 @@

1
spring-boot-project/spring-boot-test/src/test/resources/META-INF/resources/inmetainfresources
View File

@ -0,0 +1 @@

1
spring-boot-project/spring-boot-test/src/test/resources/public/inpublic
View File

@ -0,0 +1 @@

1
spring-boot-project/spring-boot-test/src/test/resources/resources/inresources
View File

@ -0,0 +1 @@

1
spring-boot-project/spring-boot-test/src/test/resources/static/instatic
View File

@ -0,0 +1 @@

1
spring-boot-project/spring-boot-test/src/test/webapp/inwebapp
View File

@ -0,0 +1 @@

6
src/checkstyle/checkstyle-suppressions.xml
View File

@ -3,8 +3,12 @@
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
"https://checkstyle.org/dtds/suppressions_1_2.dtd"> "https://checkstyle.org/dtds/suppressions_1_2.dtd">
<suppressions> <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=".+\.[jar|git|ico|p12]" checks=".*" />
<suppress files="eclipse[\\/]spring-boot-project.setup" checks="NoHttp"/>
<suppress files="SpringApplicationTests\.java" checks="FinalClass" /> <suppress files="SpringApplicationTests\.java" checks="FinalClass" />
<suppress files=".+Configuration\.java" checks="HideUtilityClassConstructor" /> <suppress files=".+Configuration\.java" checks="HideUtilityClassConstructor" />
<suppress files=".+Application\.java" checks="HideUtilityClassConstructor" /> <suppress files=".+Application\.java" checks="HideUtilityClassConstructor" />

3
src/checkstyle/nohttp-whitelist.txt
View File

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