Merge branch '1.5.x' into 2.0.x

This commit is contained in:
Phillip Webb
2019-06-07 12:05:34 -07:00
31 changed files with 71 additions and 37 deletions

View File

@@ -3,13 +3,6 @@
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
<suppressions>
<suppress files="[\\/]spring-boot-gradle-plugin[\\/]build" 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" />

View File

@@ -0,0 +1,14 @@
<?xml version="1.0"?>
<!DOCTYPE suppressions PUBLIC
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
<suppressions>
<suppress files="[\\/]transaction-logs[\\/]" checks="NoHttp" />
<suppress files="[\\/]target[\\/]" checks="NoHttp" />
<suppress files="[\\/]build.log" checks="NoHttp" />
<suppress files=".+\.(jar|git|ico|p12|gif|jks|jpg)" checks="NoHttp" />
<suppress files="dependency-reduced-pom.xml" checks="NoHttp" />
<suppress files="jquery.validate.js" checks="NoHttp" />
<suppress files="jquery-[0-9]\.[0-9]\.[0-9].js" checks="NoHttp" />
<suppress files="[\\/]spring-boot-project.setup" checks="NoHttp" />
</suppressions>

View File

@@ -0,0 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "https://checkstyle.org/dtds/configuration_1_2.dtd">
<module name="com.puppycrawl.tools.checkstyle.Checker">
<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck">
<property name="whitelistFileName" value="${main.basedir}/src/checkstyle/nohttp-whitelist.txt"/>
</module>
</module>

View File

@@ -1,2 +1,8 @@
^http://livereload.com/protocols/official-7.*
^http://docs.groovy-lang.org.*
^http://exslt.org/common.*
^http://groovy-lang.org.*
^http://hsqldb.org.*
^http://livereload.com/.*
^http://www.jdotsoft.com.*
^http://spockframework.org.*
^http://ganglia.sourceforge.net.*