From 9aae5ed3fa53b18d27af9a9b35f3df3f3a4c9f1a Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Sat, 1 Aug 2020 11:49:15 +0200 Subject: [PATCH] Update Reactor Netty modules Since reactor/reactor-netty#739, the `reactor-netty` module is now split into two: `reactor-netty-core` and `reactor-netty-http`. This commit updates the Spring Framework build accordingly. --- spring-messaging/spring-messaging.gradle | 2 +- spring-test/spring-test.gradle | 2 +- spring-web/spring-web.gradle | 2 +- spring-webflux/spring-webflux.gradle | 2 +- spring-websocket/spring-websocket.gradle | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-messaging/spring-messaging.gradle b/spring-messaging/spring-messaging.gradle index 8b5233b1c7..ee8d181060 100644 --- a/spring-messaging/spring-messaging.gradle +++ b/spring-messaging/spring-messaging.gradle @@ -8,7 +8,7 @@ dependencies { compileOnly(project(":kotlin-coroutines")) optional(project(":spring-context")) optional(project(":spring-oxm")) - optional("io.projectreactor.netty:reactor-netty") + optional("io.projectreactor.netty:reactor-netty-http") optional("io.rsocket:rsocket-core") optional("io.rsocket:rsocket-transport-netty") optional("com.fasterxml.jackson.core:jackson-databind") diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle index 506db8d5b5..1223fdff57 100644 --- a/spring-test/spring-test.gradle +++ b/spring-test/spring-test.gradle @@ -68,7 +68,7 @@ dependencies { testCompile("org.apache.tiles:tiles-servlet") testCompile("org.hsqldb:hsqldb") testCompile("org.apache.httpcomponents:httpclient") - testCompile("io.projectreactor.netty:reactor-netty") + testCompile("io.projectreactor.netty:reactor-netty-http") testCompile("de.bechte.junit:junit-hierarchicalcontextrunner") testRuntime("org.junit.vintage:junit-vintage-engine") { exclude group: "junit", module: "junit" diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index 25e4a9092d..9b5c351e7c 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -23,7 +23,7 @@ dependencies { optional("io.netty:netty-handler") 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") + optional("io.projectreactor.netty:reactor-netty-http") 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 f3732fa774..b8488d2441 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -16,7 +16,7 @@ dependencies { optional("org.freemarker:freemarker") optional("com.fasterxml.jackson.core:jackson-databind") optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile") - optional("io.projectreactor.netty:reactor-netty") + optional("io.projectreactor.netty:reactor-netty-http") optional("org.apache.tomcat:tomcat-websocket") optional("org.eclipse.jetty.websocket:websocket-server") { exclude group: "javax.servlet", module: "javax.servlet" diff --git a/spring-websocket/spring-websocket.gradle b/spring-websocket/spring-websocket.gradle index feecf0194c..6b31123438 100644 --- a/spring-websocket/spring-websocket.gradle +++ b/spring-websocket/spring-websocket.gradle @@ -25,5 +25,5 @@ dependencies { testCompile(testFixtures(project(":spring-web"))) testCompile("org.apache.tomcat.embed:tomcat-embed-core") testCompile("org.apache.tomcat.embed:tomcat-embed-websocket") - testCompile("io.projectreactor.netty:reactor-netty") + testCompile("io.projectreactor.netty:reactor-netty-http") }