Merge branch '1.5.x' into 2.0.x

pull/13312/merge
Phillip Webb 7 years ago
commit 401fcbeaa4

@ -581,6 +581,9 @@
<executions> <executions>
<execution> <execution>
<phase>validate</phase> <phase>validate</phase>
<configuration>
<skip>${disable.checks}</skip>
</configuration>
<goals> <goals>
<goal>validate</goal> <goal>validate</goal>
</goals> </goals>
@ -595,6 +598,7 @@
<id>checkstyle-validation</id> <id>checkstyle-validation</id>
<phase>validate</phase> <phase>validate</phase>
<configuration> <configuration>
<skip>${disable.checks}</skip>
<configLocation>src/checkstyle/checkstyle.xml</configLocation> <configLocation>src/checkstyle/checkstyle.xml</configLocation>
<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation> <suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory> <includeTestSourceDirectory>true</includeTestSourceDirectory>

@ -16,6 +16,7 @@
<main.basedir>${basedir}/..</main.basedir> <main.basedir>${basedir}/..</main.basedir>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<spring-javaformat.version>0.0.2</spring-javaformat.version> <spring-javaformat.version>0.0.2</spring-javaformat.version>
<disable.checks>false</disable.checks>
</properties> </properties>
<modules> <modules>
<module>spring-boot-sample-ant</module> <module>spring-boot-sample-ant</module>
@ -182,6 +183,9 @@
<executions> <executions>
<execution> <execution>
<phase>validate</phase> <phase>validate</phase>
<configuration>
<skip>${disable.checks}</skip>
</configuration>
<goals> <goals>
<goal>validate</goal> <goal>validate</goal>
</goals> </goals>
@ -209,6 +213,7 @@
<id>checkstyle-validation</id> <id>checkstyle-validation</id>
<phase>validate</phase> <phase>validate</phase>
<configuration> <configuration>
<skip>${disable.checks}</skip>
<configLocation>../spring-boot-parent/src/checkstyle/checkstyle.xml</configLocation> <configLocation>../spring-boot-parent/src/checkstyle/checkstyle.xml</configLocation>
<suppressionsLocation>../spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation> <suppressionsLocation>../spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory> <includeTestSourceDirectory>true</includeTestSourceDirectory>
@ -275,4 +280,17 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>fast</id>
<activation>
<property>
<name>fast</name>
</property>
</activation>
<properties>
<disable.checks>true</disable.checks>
</properties>
</profile>
</profiles>
</project> </project>

Loading…
Cancel
Save