Merge branch '6.1.x'

spring-projects · Mar 22, 2024 · cf4ac96 · cf4ac96
2 parents 0a50854 + c7c61e1
commit cf4ac96
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...s/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/...s/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
@@ -2520,7 +2520,7 @@ public Object getOrderSource(Object obj) {
 
  private enum PreInstantiation {
 
- MAIN, BACKGROUND;
+ MAIN, BACKGROUND
  }
 
 }
diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
@@ -200,6 +200,7 @@
  <module name="com.puppycrawl.tools.checkstyle.checks.UpperEllCheck"/>
  <module name="com.puppycrawl.tools.checkstyle.checks.ArrayTypeStyleCheck"/>
  <module name="com.puppycrawl.tools.checkstyle.checks.OuterTypeFilenameCheck"/>
+ <module name="UnnecessarySemicolonInEnumeration"/>
 
  <!-- Regexp -->
  <module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">