From e70f02c4a245b4fcace6daf0335f3aa384a99f72 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 10 Sep 2015 09:40:26 +0200
Subject: [PATCH] Relocate checkstyle configuration

See gh-3928
---
 spring-boot-parent/pom.xml                                | 8 ++++----
 .../{ => src/checkstyle}/checkstyle-header.txt            | 0
 .../{ => src/checkstyle}/checkstyle-import-control.xml    | 0
 .../{ => src/checkstyle}/checkstyle-suppressions.xml      | 0
 spring-boot-parent/{ => src/checkstyle}/checkstyle.xml    | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename spring-boot-parent/{ => src/checkstyle}/checkstyle-header.txt (100%)
 rename spring-boot-parent/{ => src/checkstyle}/checkstyle-import-control.xml (100%)
 rename spring-boot-parent/{ => src/checkstyle}/checkstyle-suppressions.xml (100%)
 rename spring-boot-parent/{ => src/checkstyle}/checkstyle.xml (100%)

diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml
index c23b423e2c..196a92cd72 100755
--- a/spring-boot-parent/pom.xml
+++ b/spring-boot-parent/pom.xml
@@ -420,7 +420,7 @@
 							<outputDirectory>${project.build.directory}</outputDirectory>
 							<resources>
 								<resource>
-									<directory>${main.basedir}/spring-boot-parent</directory>
+									<directory>${main.basedir}/spring-boot-parent/src/checkstyle</directory>
 									<includes>
 										<include>checkstyle-import-control.xml</include>
 									</includes>
@@ -438,9 +438,9 @@
 						<id>checkstyle-validation</id>
 						<phase>validate</phase>
 						<configuration>
-							<configLocation>checkstyle.xml</configLocation>
-							<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
-							<headerLocation>checkstyle-header.txt</headerLocation>
+							<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>
 							<encoding>UTF-8</encoding>
 							<consoleOutput>true</consoleOutput>
diff --git a/spring-boot-parent/checkstyle-header.txt b/spring-boot-parent/src/checkstyle/checkstyle-header.txt
similarity index 100%
rename from spring-boot-parent/checkstyle-header.txt
rename to spring-boot-parent/src/checkstyle/checkstyle-header.txt
diff --git a/spring-boot-parent/checkstyle-import-control.xml b/spring-boot-parent/src/checkstyle/checkstyle-import-control.xml
similarity index 100%
rename from spring-boot-parent/checkstyle-import-control.xml
rename to spring-boot-parent/src/checkstyle/checkstyle-import-control.xml
diff --git a/spring-boot-parent/checkstyle-suppressions.xml b/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
similarity index 100%
rename from spring-boot-parent/checkstyle-suppressions.xml
rename to spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
diff --git a/spring-boot-parent/checkstyle.xml b/spring-boot-parent/src/checkstyle/checkstyle.xml
similarity index 100%
rename from spring-boot-parent/checkstyle.xml
rename to spring-boot-parent/src/checkstyle/checkstyle.xml