From fe8188764acb58a24e00f3fef658217292ed621f Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 23 Dec 2016 09:02:43 -0500 Subject: [PATCH] Upgrade to Reactor 3.0.4 and reactor-netty-0.6.0 --- build.gradle | 4 ++-- .../integration/endpoint/ReactiveConsumer.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 344d582c4b..98792dc440 100644 --- a/build.gradle +++ b/build.gradle @@ -115,8 +115,8 @@ subprojects { subproject -> mysqlVersion = '5.1.34' pahoMqttClientVersion = '1.0.2' postgresVersion = '9.1-901-1.jdbc4' - reactorNettyVersion = '0.6.0.BUILD-SNAPSHOT' - reactorVersion = '3.0.3.RELEASE' + reactorNettyVersion = '0.6.0.RELEASE' + reactorVersion = '3.0.4.RELEASE' romeToolsVersion = '1.7.0' servletApiVersion = '3.1.0' slf4jVersion = "1.7.21" diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ReactiveConsumer.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ReactiveConsumer.java index a32174cd5e..4fc4bf8c61 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ReactiveConsumer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ReactiveConsumer.java @@ -33,7 +33,7 @@ import org.springframework.messaging.SubscribableChannel; import org.springframework.util.Assert; import org.springframework.util.ErrorHandler; -import reactor.core.Cancellation; +import reactor.core.Disposable; import reactor.core.Exceptions; import reactor.core.Receiver; import reactor.core.Trackable; @@ -195,7 +195,7 @@ public class ReactiveConsumer extends AbstractEndpoint { } - private static final class ConsumerSubscriber implements Subscriber>, Receiver, Cancellation, Trackable { + private static final class ConsumerSubscriber implements Subscriber>, Receiver, Disposable, Trackable { private final Consumer> consumer;