Merge branch '3.0.x' into 3.1.x

Closes gh-36523
spring-projects · Jul 24, 2023 · a38726f · a38726f
2 parents f23cb1f + 72b682e
commit a38726f
Show file tree

Hide file tree

Showing 9 changed files with 158 additions and 129 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,6 @@
 .classpath
 .factorypath
 .gradle
-.idea
 .metadata
 .project
 .recommenders

diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/copyright/java.xml b/.idea/copyright/java.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/scopes/java.xml b/.idea/scopes/java.xml
diff --git a/idea/codeStyleConfig.xml b/idea/codeStyleConfig.xml