Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.6.x' into 2.7.x

Browse Source 
Closes gh-29613
This commit is contained in:
Stephane Nicoll
2022-02-01 11:07:31 +01:00
parent 19e671dd7b 136b5959c3
commit f812b33cbd
204 changed files with 1306 additions and 1333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/checkstyle/checkstyle.xml
View File

@@ -48,7 +48,7 @@
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
<property name="maximum" value="0"/>
<property name="format" value="org\.mockito\.(Mockito|BDDMockito)\.(when|doThrow|doAnswer)" />
<property name="format" value="org\.mockito\.(Mockito|BDDMockito)\.(when|doThrow|doAnswer|doReturn|verify|verifyNoInteractions|verifyNoMoreInteractions)" />
<property name="message"
value="Please use BDD-style (given, when, then) using BDDMockito imports." />
<property name="ignoreComments" value="true" />