root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

This commit is contained in:
Stéphane Nicoll 2024-03-22 16:33:17 +01:00
parent 0a50854e1a c7c61e13e1
commit cf4ac96688
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
View File

@ -2520,7 +2520,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
private enum PreInstantiation { private enum PreInstantiation {
MAIN, BACKGROUND; MAIN, BACKGROUND
} }
} }

1
src/checkstyle/checkstyle.xml
View File

@ -200,6 +200,7 @@
<module name="com.puppycrawl.tools.checkstyle.checks.UpperEllCheck"/> <module name="com.puppycrawl.tools.checkstyle.checks.UpperEllCheck"/>
<module name="com.puppycrawl.tools.checkstyle.checks.ArrayTypeStyleCheck"/> <module name="com.puppycrawl.tools.checkstyle.checks.ArrayTypeStyleCheck"/>
<module name="com.puppycrawl.tools.checkstyle.checks.OuterTypeFilenameCheck"/> <module name="com.puppycrawl.tools.checkstyle.checks.OuterTypeFilenameCheck"/>
<module name="UnnecessarySemicolonInEnumeration"/>
<!-- Regexp --> <!-- Regexp -->
<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">