From 2a16c25977c1fb4cc03cadb392e4edcf2fdf0970 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Tue, 6 Oct 2015 18:14:44 -0700
Subject: [PATCH] Replace import-control checkstyle file with regex

Fix Eclipse build warnings by replacing checkstyle's import-control file
with a simple regex rule.

Fixes gh-4006
---
 spring-boot-parent/pom.xml                    | 24 -------------------
 .../checkstyle/checkstyle-import-control.xml  | 12 ----------
 .../src/checkstyle/checkstyle.xml             | 10 +++++---
 3 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 spring-boot-parent/src/checkstyle/checkstyle-import-control.xml

diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml
index 10b1a92e96..4f1a2647e4 100755
--- a/spring-boot-parent/pom.xml
+++ b/spring-boot-parent/pom.xml
@@ -444,30 +444,6 @@
 			</plugins>
 		</pluginManagement>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>checkstyle-prepare</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}</outputDirectory>
-							<resources>
-								<resource>
-									<directory>${main.basedir}/spring-boot-parent/src/checkstyle</directory>
-									<includes>
-										<include>checkstyle-import-control.xml</include>
-									</includes>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/spring-boot-parent/src/checkstyle/checkstyle-import-control.xml b/spring-boot-parent/src/checkstyle/checkstyle-import-control.xml
deleted file mode 100644
index 2885367f6b..0000000000
--- a/spring-boot-parent/src/checkstyle/checkstyle-import-control.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE import-control PUBLIC "-//Puppy Crawl//DTD Import Control 1.1//EN" "http://www.puppycrawl.com/dtds/import_control_1_1.dtd">
-<import-control pkg="org.springframework.boot">
-
-	<allow pkg=".*" regex="true"/>
-
-	<!-- Use BDD Mockito -->
-	<disallow class="org.mockito.Mockito.when"/>
-	<disallow class="org.mockito.Mockito.doThrow"/>
-	<disallow class="org.mockito.Mockito.doAnswer"/>
-
-</import-control>
diff --git a/spring-boot-parent/src/checkstyle/checkstyle.xml b/spring-boot-parent/src/checkstyle/checkstyle.xml
index 85a7d98753..cf2d62a23f 100644
--- a/spring-boot-parent/src/checkstyle/checkstyle.xml
+++ b/spring-boot-parent/src/checkstyle/checkstyle.xml
@@ -83,9 +83,6 @@
 			<property name="option" value="bottom" />
 			<property name="sortStaticImportsAlphabetically" value="true" />
 		</module>
-		<module name="ImportControl">
-			<property name="file" value="${checkstyle.build.directory}/checkstyle-import-control.xml"/>
-		</module>
 
 		<!-- Javadoc Comments -->
 		<module name="JavadocType">
@@ -130,6 +127,13 @@
 				value="Line has leading space characters; indentation should be performed with tabs only." />
 			<property name="ignoreComments" value="true" />
 		</module>
+ 		<module name="RegexpSinglelineJava">
+ 			<property name="maximum" value="0"/>
+			<property name="format" value="org\.mockito\.Mockito\.(when|doThrow|doAnswer)" />
+			<property name="message"
+				value="Please use BDDMockto imports." />
+			<property name="ignoreComments" value="true" />
+		</module>
 		<module name="Regexp">
 			<property name="format" value="[ \t]+$" />
 			<property name="illegalPattern" value="true" />