Merge branch '6.1.x'

jhoeller · jhoeller · commit e43e65998360 · 2024-06-11T09:11:42.000+02:00
# Conflicts:
#	framework-docs/modules/ROOT/pages/core/beans/definition.adoc
#	framework-platform/framework-platform.gradle
#	spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
@@ -1,2 +1,2 @@
 org.gradle.caching=true
-javaFormatVersion=0.0.41
+javaFormatVersion=0.0.42

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`org.gradle.caching=true`
`2`		`-javaFormatVersion=0.0.41`
	`2`	`+javaFormatVersion=0.0.42`