mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.0.x' into 2.1.x
This commit is contained in:
commit
866e2b712e
20
pom.xml
20
pom.xml
@ -60,14 +60,28 @@
|
|||||||
<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>
|
||||||
<sourceDirectories>./</sourceDirectories>
|
|
||||||
<includes>**/*</includes>
|
|
||||||
<excludes>.git/**/*,target/**/*</excludes>
|
|
||||||
</configuration>
|
</configuration>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>check</goal>
|
<goal>check</goal>
|
||||||
</goals>
|
</goals>
|
||||||
</execution>
|
</execution>
|
||||||
|
<execution>
|
||||||
|
<id>nohttp-checkstyle-validation</id>
|
||||||
|
<phase>validate</phase>
|
||||||
|
<configuration>
|
||||||
|
<skip>${disable.checks}</skip>
|
||||||
|
<configLocation>src/checkstyle/nohttp-checkstyle.xml</configLocation>
|
||||||
|
<suppressionsLocation>src/checkstyle/nohttp-checkstyle-suppressions.xml</suppressionsLocation>
|
||||||
|
<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
|
||||||
|
<sourceDirectories>${basedir}</sourceDirectories>
|
||||||
|
<includes>**/*</includes>
|
||||||
|
<excludes>.git/**/*,target/**/,**/.flattened-pom.xml</excludes>
|
||||||
|
</configuration>
|
||||||
|
<goals>
|
||||||
|
<goal>check</goal>
|
||||||
|
</goals>
|
||||||
|
<inherited>false</inherited>
|
||||||
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2018 the original author or authors.
|
* Copyright 2012-2019 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2018 the original author or authors.
|
* Copyright 2012-2019 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -3,13 +3,6 @@
|
|||||||
"-//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="[\\/]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="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" />
|
||||||
|
14
src/checkstyle/nohttp-checkstyle-suppressions.xml
Normal file
14
src/checkstyle/nohttp-checkstyle-suppressions.xml
Normal 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>
|
7
src/checkstyle/nohttp-checkstyle.xml
Normal file
7
src/checkstyle/nohttp-checkstyle.xml
Normal 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>
|
@ -1,2 +1,8 @@
|
|||||||
^http://livereload.com/protocols/official-7.*
|
^http://docs.groovy-lang.org.*
|
||||||
^http://exslt.org/common.*
|
^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.*
|
||||||
|
Loading…
Reference in New Issue
Block a user