Skip to content

S
spring-boot
Commit 6425fb6e authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Merge branch '2.0.x' into 2.1.x 

Closes gh-17361
parents 9aa48873 4f079803
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
pom.xml
View file @ 6425fb6e
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</property> </property>
</activation> </activation>
<properties> <properties>
<spring-javaformat.version>0.0.14</spring-javaformat.version> <spring-javaformat.version>0.0.15</spring-javaformat.version>
<nohttp-checkstyle.version>0.0.1.RELEASE</nohttp-checkstyle.version> <nohttp-checkstyle.version>0.0.1.RELEASE</nohttp-checkstyle.version>
</properties> </properties>
<build> <build>
......
src/checkstyle/checkstyle-suppressions.xml
View file @ 6425fb6e
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
"-//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=".*" checks="SpringMethodVisibility"/>
<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" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment