Skip to content

Commit de4de02

Browse files
committed
Merge branch '7.0.x'
# Conflicts: # framework-platform/framework-platform.gradle # spring-context/src/main/java/org/springframework/validation/DataBinder.java
2 parents e6ce2a3 + fe27ad2 commit de4de02

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

framework-platform/framework-platform.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ javaPlatform {
99
dependencies {
1010
api(platform("com.fasterxml.jackson:jackson-bom:2.21.2"))
1111
api(platform("io.micrometer:micrometer-bom:1.16.5"))
12-
api(platform("io.netty:netty-bom:4.2.14.Final"))
12+
api(platform("io.netty:netty-bom:4.2.15.Final"))
1313
api(platform("io.projectreactor:reactor-bom:2025.0.5"))
1414
api(platform("io.rsocket:rsocket-bom:1.1.5"))
1515
api(platform("org.apache.groovy:groovy-bom:5.0.6"))

0 commit comments

Comments
 (0)