From f877f81ae405922b8db0383d33af51e8fed94a41 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Tue, 30 Aug 2022 21:58:41 +0200 Subject: [PATCH] Move Netty 5 dependency to Framework platform --- framework-platform/framework-platform.gradle | 1 + spring-core/spring-core.gradle | 2 +- spring-web/spring-web.gradle | 2 +- spring-webflux/spring-webflux.gradle | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index 01d601f9a2..1916e12288 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -9,6 +9,7 @@ javaPlatform { dependencies { api(platform("com.fasterxml.jackson:jackson-bom:2.13.3")) api(platform("io.netty:netty-bom:4.1.79.Final")) + api(platform("io.netty:netty5-bom:5.0.0.Alpha4")) api(platform("io.projectreactor:reactor-bom:2022.0.0-M4")) api(platform("io.rsocket:rsocket-bom:1.1.2")) api(platform("org.apache.groovy:groovy-bom:4.0.4")) diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle index 49200e16c7..2fcecee953 100644 --- a/spring-core/spring-core.gradle +++ b/spring-core/spring-core.gradle @@ -72,7 +72,7 @@ dependencies { optional("io.reactivex.rxjava3:rxjava") optional("io.smallrye.reactive:mutiny") optional("io.netty:netty-buffer") - optional("io.netty:netty5-buffer:5.0.0.Alpha4") + optional("io.netty:netty5-buffer") testImplementation("jakarta.annotation:jakarta.annotation-api") testImplementation("jakarta.xml.bind:jakarta.xml.bind-api") testImplementation("com.google.code.findbugs:jsr305") diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index 8835da7961..9e8c1511be 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -23,7 +23,7 @@ dependencies { optional("io.netty:netty-codec-http") // Until Netty4ClientHttpRequest is removed optional("io.netty:netty-transport") // Until Netty4ClientHttpRequest is removed optional("io.projectreactor.netty:reactor-netty-http") - optional("io.netty:netty5-buffer:5.0.0.Alpha4") + optional("io.netty:netty5-buffer") optional("io.undertow:undertow-core") optional("org.apache.tomcat.embed:tomcat-embed-core") optional("org.eclipse.jetty:jetty-server") { diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index 60942ceb4d..dad4a490b6 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -59,7 +59,7 @@ dependencies { testRuntimeOnly("com.sun.xml.bind:jaxb-core") testRuntimeOnly("com.sun.xml.bind:jaxb-impl") testRuntimeOnly("com.sun.activation:jakarta.activation") - testRuntimeOnly("io.netty:netty5-buffer:5.0.0.Alpha4") + testRuntimeOnly("io.netty:netty5-buffer") } test {