Merge branch '2.1.x'

Closes spring-projectsgh-17019
nosan · May 29, 2019 · 2a66daf · 2a66daf
2 parents 791be95 + d057f49
commit 2a66daf
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
@@ -19,6 +19,13 @@
 				value="${main.basedir}/src/checkstyle/import-control.xml" />
 			<property name="path" value="^.*[\\/]src[\\/]main[\\/].*$" />
 		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
+			<property name="maximum" value="0"/>
+			<property name="format" value="org\.junit\.Assert\.assert" />
+			<property name="message"
+				value="Please use AssertJ imports." />
+			<property name="ignoreComments" value="true" />
+		</module>
 		<module
 			name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
 			<property name="maximum" value="0" />