From 1aea280cc96e3e54c7914a363c907b78af3cf07f Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 27 Jun 2019 11:14:36 -0400 Subject: [PATCH] Remove explicit Reactor deps for RSockets * It looks like we don't need to manage Reactor dependencies in the RSocket module: the `io.rsocket:rsocket-transport-netty` brings everything we need, although it doesn't that with its own supported versions * Use non-HTTPS url for `example.org` in test config to avoid SSL handshake --- build.gradle | 2 -- .../rsocket/config/RSocketInboundGatewayParserTests-context.xml | 2 +- .../config/RSocketOutboundGatewayParserTests-context.xml | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index f9e7aca6c6..511f2d5e93 100644 --- a/build.gradle +++ b/build.gradle @@ -615,8 +615,6 @@ project('spring-integration-rsocket') { description = 'Spring Integration RSocket Support' dependencies { compile project(":spring-integration-core") - compile("io.projectreactor.netty:reactor-netty:$reactorNettyVersion") - compile("io.rsocket:rsocket-core:$rsocketVersion") compile("io.rsocket:rsocket-transport-netty:$rsocketVersion") testCompile "io.projectreactor:reactor-test:$reactorVersion" diff --git a/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/config/RSocketInboundGatewayParserTests-context.xml b/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/config/RSocketInboundGatewayParserTests-context.xml index d1c5fed8be..9cd4c3b04b 100644 --- a/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/config/RSocketInboundGatewayParserTests-context.xml +++ b/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/config/RSocketInboundGatewayParserTests-context.xml @@ -8,7 +8,7 @@ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd"> - + diff --git a/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/config/RSocketOutboundGatewayParserTests-context.xml b/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/config/RSocketOutboundGatewayParserTests-context.xml index 32ccf1561c..0ad2dc1c97 100644 --- a/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/config/RSocketOutboundGatewayParserTests-context.xml +++ b/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/config/RSocketOutboundGatewayParserTests-context.xml @@ -8,7 +8,7 @@ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd"> - +