Merge branch '6.0.x'

# Conflicts: # framework-platform/framework-platform.gradle
1 year ago · b53034fe62
1 changed files with 1 additions and 1 deletions
--- a/framework-platform/framework-platform.gradle
+++ b/framework-platform/framework-platform.gradle
@ -9,7 +9,7 @@ javaPlatform {
				@@ -9,7 +9,7 @@ javaPlatform {
 dependencies {
 	api(platform("com.fasterxml.jackson:jackson-bom:2.15.2"))
 	api(platform("io.micrometer:micrometer-bom:1.12.0-M1"))
-	api(platform("io.netty:netty-bom:4.1.94.Final"))
+	api(platform("io.netty:netty-bom:4.1.95.Final"))
 	api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
 	api(platform("io.projectreactor:reactor-bom:2023.0.0-M1"))
 	api(platform("io.rsocket:rsocket-bom:1.1.3"))