Merge branch '1.5.x' into 2.0.x

2018-05-30 13:29:10 -07:00
parent 587df6a07a 2bfcefa48e
commit 401fcbeaa4
2 changed files with 22 additions and 0 deletions
--- a/spring-boot-project/spring-boot-parent/pom.xml
+++ b/spring-boot-project/spring-boot-parent/pom.xml
@@ -581,6 +581,9 @@
 				<executions>
 					<execution>
 						<phase>validate</phase>
+						<configuration>
+							<skip>${disable.checks}</skip>
+						</configuration>
 						<goals>
 							<goal>validate</goal>
 						</goals>
@@ -595,6 +598,7 @@
 						<id>checkstyle-validation</id>
 						<phase>validate</phase>
 						<configuration>
+							<skip>${disable.checks}</skip>
 							<configLocation>src/checkstyle/checkstyle.xml</configLocation>
 							<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
 							<includeTestSourceDirectory>true</includeTestSourceDirectory>