Merge branch '6.1.x'

# Conflicts:
#	framework-platform/framework-platform.gradle

Author: jhoeller

framework-platform/framework-platform.gradle

@@ -9,7 +9,7 @@ javaPlatform {
 dependencies {
 	api(platform("com.fasterxml.jackson:jackson-bom:2.18.1"))
 	api(platform("io.micrometer:micrometer-bom:1.14.0"))
-	api(platform("io.netty:netty-bom:4.1.114.Final"))
+	api(platform("io.netty:netty-bom:4.1.115.Final"))
 	api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
 	api(platform("io.projectreactor:reactor-bom:2024.0.0"))
 	api(platform("io.rsocket:rsocket-bom:1.1.4"))