Skip to content

S
spring-boot
Commit 2d995661 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '1.4.x' into 1.5.x

parents c6f23000 00a10bcf
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
spring-boot-docs/pom.xml
View file @ 2d995661
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
</organization> </organization>
<properties> <properties>
<main.basedir>${basedir}/..</main.basedir> <main.basedir>${basedir}/..</main.basedir>
<disable.checks>true</disable.checks>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
......
spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
View file @ 2d995661
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<suppress files="[\\/]src[\\/]test[\\/]java[\\/]" checks="Javadoc*" /> <suppress files="[\\/]src[\\/]test[\\/]java[\\/]" checks="Javadoc*" />
<suppress files="[\\/]autoconfigure[\\/]" checks="JavadocType" /> <suppress files="[\\/]autoconfigure[\\/]" checks="JavadocType" />
<suppress files="[\\/]autoconfigure[\\/]" checks="JavadocVariable" /> <suppress files="[\\/]autoconfigure[\\/]" checks="JavadocVariable" />
<suppress files="[\\/]spring-boot-docs[\\/]" checks="JavadocType" />
<suppress files="[\\/]spring-boot-samples[\\/]" checks="JavadocType" /> <suppress files="[\\/]spring-boot-samples[\\/]" checks="JavadocType" />
<suppress files="[\\/]spring-boot-deployment-tests[\\/]" checks="JavadocType" /> <suppress files="[\\/]spring-boot-deployment-tests[\\/]" checks="JavadocType" />
<suppress files="[\\/]spring-boot-integration-tests[\\/]" checks="JavadocType" /> <suppress files="[\\/]spring-boot-integration-tests[\\/]" checks="JavadocType" />
......
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