From 08d89f7aaca1dff971c32be0c56fc56618f4c9af Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 2 Aug 2023 01:32:29 +0200 Subject: [PATCH 1/2] Avoid Aalto XML parser override --- spring-web/spring-web.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index 10a4f0aaaa..f6c9eb6121 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -11,7 +11,6 @@ dependencies { optional(project(":spring-aop")) optional(project(":spring-context")) optional(project(":spring-oxm")) - optional("com.fasterxml:aalto-xml") optional("com.fasterxml.jackson.core:jackson-databind") optional("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor") optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile") @@ -65,6 +64,7 @@ dependencies { optional("org.jetbrains.kotlinx:kotlinx-serialization-cbor") optional("org.jetbrains.kotlinx:kotlinx-serialization-json") optional("org.jetbrains.kotlinx:kotlinx-serialization-protobuf") + optional("com.fasterxml:aalto-xml") // out of order to avoid XML parser override testFixturesApi("jakarta.servlet:jakarta.servlet-api") testFixturesApi("org.junit.jupiter:junit-jupiter-api") testFixturesApi("org.junit.jupiter:junit-jupiter-params") From 7adacd5ce5653f5db39303c15b065017f03a3ca2 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 2 Aug 2023 01:34:18 +0200 Subject: [PATCH 2/2] Upgrade to Netty 4.1.96 --- framework-platform/framework-platform.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index c693f4ffe3..b511165fe4 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -9,7 +9,7 @@ javaPlatform { dependencies { api(platform("com.fasterxml.jackson:jackson-bom:2.14.3")) api(platform("io.micrometer:micrometer-bom:1.10.9")) - api(platform("io.netty:netty-bom:4.1.95.Final")) + api(platform("io.netty:netty-bom:4.1.96.Final")) api(platform("io.netty:netty5-bom:5.0.0.Alpha5")) api(platform("io.projectreactor:reactor-bom:2022.0.9")) api(platform("io.rsocket:rsocket-bom:1.1.3"))