root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix checkstyle import control 

Use fully expanded referenced in an attempt to make the CI happy.

Fixes gh-8532
This commit is contained in:
Phillip Webb 2017-03-12 22:27:49 -07:00
parent 5d89a0c0b7
commit b0eb5ef71b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-parent/pom.xml
View File

@ -18,7 +18,7 @@
<url>http://www.spring.io</url> <url>http://www.spring.io</url>
</organization> </organization>
<properties> <properties>
<main.basedir>..</main.basedir> <main.basedir>${basedir}/..</main.basedir>
<disable.checks>false</disable.checks> <disable.checks>false</disable.checks>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<aether.version>1.0.2.v20150114</aether.version> <aether.version>1.0.2.v20150114</aether.version>
@ -502,7 +502,7 @@
<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>
<headerLocation>src/checkstyle/checkstyle-header.txt</headerLocation> <headerLocation>src/checkstyle/checkstyle-header.txt</headerLocation>
<propertyExpansion>checkstyle.build.directory=${project.build.directory}</propertyExpansion> <propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput> <consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError> <failsOnError>true</failsOnError>

2
spring-boot-parent/src/checkstyle/checkstyle.xml
View File

@ -78,7 +78,7 @@
<property name="processJavadoc" value="true" /> <property name="processJavadoc" value="true" />
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.imports.ImportControlCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.imports.ImportControlCheck">
<property name="file" value="spring-boot-parent/src/checkstyle/import-control.xml" /> <property name="file" value="file://${main.basedir}/spring-boot-parent/src/checkstyle/import-control.xml" />
<property name="path" value="^.*[\\/]src[\\/]main[\\/].*$" /> <property name="path" value="^.*[\\/]src[\\/]main[\\/].*$" />
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck">