Merge branch '7.0.x'

# Conflicts:
#	framework-platform/framework-platform.gradle
This commit is contained in:
Juergen Hoeller
2026-08-11 23:23:40 +02:00
9 changed files with 14 additions and 6 deletions
+4 -4
View File
@@ -9,14 +9,14 @@ javaPlatform {
dependencies {
api(platform("com.fasterxml.jackson:jackson-bom:2.21.4"))
api(platform("io.micrometer:micrometer-bom:1.18.0-SNAPSHOT"))
api(platform("io.netty:netty-bom:4.2.15.Final"))
api(platform("io.netty:netty-bom:4.2.17.Final"))
api(platform("io.projectreactor:reactor-bom:2026.0.0-SNAPSHOT"))
api(platform("io.rsocket:rsocket-bom:1.1.5"))
api(platform("org.apache.groovy:groovy-bom:5.0.7"))
api(platform("org.apache.groovy:groovy-bom:5.0.8"))
api(platform("org.apache.logging.log4j:log4j-bom:2.26.1"))
api(platform("org.assertj:assertj-bom:3.27.7"))
api(platform("org.eclipse.jetty:jetty-bom:12.1.11"))
api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.11"))
api(platform("org.eclipse.jetty:jetty-bom:12.1.12"))
api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.12"))
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.11.0"))
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.11.0"))
api(platform("org.junit:junit-bom:6.1.2"))