From b0eb5ef71b84a8ea084fade044573042c93f5701 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Sun, 12 Mar 2017 22:27:49 -0700
Subject: [PATCH] Fix checkstyle import control

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

Fixes gh-8532
---
 spring-boot-parent/pom.xml                       | 4 ++--
 spring-boot-parent/src/checkstyle/checkstyle.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml
index f096a5a738..c5a89b8192 100644
--- a/spring-boot-parent/pom.xml
+++ b/spring-boot-parent/pom.xml
@@ -18,7 +18,7 @@
 		<url>http://www.spring.io</url>
 	</organization>
 	<properties>
-		<main.basedir>..</main.basedir>
+		<main.basedir>${basedir}/..</main.basedir>
 		<disable.checks>false</disable.checks>
 		<java.version>1.8</java.version>
 		<aether.version>1.0.2.v20150114</aether.version>
@@ -502,7 +502,7 @@
 							<configLocation>src/checkstyle/checkstyle.xml</configLocation>
 							<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
 							<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>
 							<consoleOutput>true</consoleOutput>
 							<failsOnError>true</failsOnError>
diff --git a/spring-boot-parent/src/checkstyle/checkstyle.xml b/spring-boot-parent/src/checkstyle/checkstyle.xml
index 01aad59145..987cde3447 100644
--- a/spring-boot-parent/src/checkstyle/checkstyle.xml
+++ b/spring-boot-parent/src/checkstyle/checkstyle.xml
@@ -78,7 +78,7 @@
 			<property name="processJavadoc" value="true" />
 		</module>
 		<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[\\/].*$" />
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck">