Skip to content

Commit aca79f8

Browse files
committed
Fix deprecation from SF-5.0.3
* Upgrade to Spring Data Key SR3, Reactor-3.1.3, Reactor Netty-0.7.3
1 parent 534bb6c commit aca79f8

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,16 +123,16 @@ subprojects { subproject ->
123123
mysqlVersion = '6.0.6'
124124
pahoMqttClientVersion = '1.2.0'
125125
postgresVersion = '42.0.0'
126-
reactorNettyVersion = '0.7.2.RELEASE'
127-
reactorVersion = '3.1.2.RELEASE'
126+
reactorNettyVersion = '0.7.3.RELEASE'
127+
reactorVersion = '3.1.3.RELEASE'
128128
romeToolsVersion = '1.8.0'
129129
servletApiVersion = '4.0.0'
130130
smackVersion = '4.2.2'
131131
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.1.RELEASE'
132-
springDataJpaVersion = '2.0.2.RELEASE'
133-
springDataMongoVersion = '2.0.2.RELEASE'
134-
springDataRedisVersion = '2.0.2.RELEASE'
135-
springGemfireVersion = '2.0.2.RELEASE'
132+
springDataJpaVersion = '2.0.3.RELEASE'
133+
springDataMongoVersion = '2.0.3.RELEASE'
134+
springDataRedisVersion = '2.0.3.RELEASE'
135+
springGemfireVersion = '2.0.3.RELEASE'
136136
springSecurityVersion = '5.0.0.RELEASE'
137137
springSocialTwitterVersion = '1.1.2.RELEASE'
138138
springRetryVersion = '1.2.1.RELEASE'

spring-integration-stomp/src/test/java/org/springframework/integration/stomp/inbound/StompInboundChannelAdapterWebSocketIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@
7777
import org.springframework.web.socket.WebSocketHttpHeaders;
7878
import org.springframework.web.socket.client.WebSocketClient;
7979
import org.springframework.web.socket.client.standard.StandardWebSocketClient;
80-
import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer;
8180
import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
8281
import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
82+
import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
8383
import org.springframework.web.socket.messaging.SessionSubscribeEvent;
8484
import org.springframework.web.socket.messaging.WebSocketStompClient;
8585
import org.springframework.web.socket.server.HandshakeInterceptor;
@@ -321,7 +321,7 @@ public ApplicationListener<ApplicationEvent> stompEventListener() {
321321

322322
@Configuration
323323
@EnableWebSocketMessageBroker
324-
static class ServerConfig extends AbstractWebSocketMessageBrokerConfigurer {
324+
static class ServerConfig implements WebSocketMessageBrokerConfigurer {
325325

326326
@Bean
327327
public DefaultHandshakeHandler handshakeHandler() {

spring-integration-stomp/src/test/java/org/springframework/integration/stomp/outbound/StompMessageHandlerWebSocketIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@
7979
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
8080
import org.springframework.web.socket.client.WebSocketClient;
8181
import org.springframework.web.socket.client.standard.StandardWebSocketClient;
82-
import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer;
8382
import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
8483
import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
84+
import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
8585
import org.springframework.web.socket.messaging.WebSocketStompClient;
8686
import org.springframework.web.socket.server.standard.TomcatRequestUpgradeStrategy;
8787
import org.springframework.web.socket.server.support.DefaultHandshakeHandler;
@@ -252,7 +252,7 @@ public void handle() {
252252
basePackageClasses = StompMessageHandlerWebSocketIntegrationTests.class,
253253
useDefaultFilters = false,
254254
includeFilters = @ComponentScan.Filter(IntegrationTestController.class))
255-
static class ServerConfig extends AbstractWebSocketMessageBrokerConfigurer {
255+
static class ServerConfig implements WebSocketMessageBrokerConfigurer {
256256

257257
@Bean
258258
public DefaultHandshakeHandler handshakeHandler() {

spring-integration-websocket/src/test/java/org/springframework/integration/websocket/client/StompIntegrationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2017 the original author or authors.
2+
* Copyright 2014-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -88,9 +88,9 @@
8888
import org.springframework.util.MultiValueMap;
8989
import org.springframework.web.socket.client.WebSocketClient;
9090
import org.springframework.web.socket.client.standard.StandardWebSocketClient;
91-
import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer;
9291
import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
9392
import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
93+
import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
9494
import org.springframework.web.socket.messaging.AbstractSubProtocolEvent;
9595
import org.springframework.web.socket.messaging.SessionConnectedEvent;
9696
import org.springframework.web.socket.messaging.SessionSubscribeEvent;
@@ -462,7 +462,7 @@ interface WebSocketGateway {
462462
useDefaultFilters = false,
463463
includeFilters = @ComponentScan.Filter(IntegrationTestController.class))
464464
@IntegrationComponentScan
465-
static class ServerConfig extends AbstractWebSocketMessageBrokerConfigurer {
465+
static class ServerConfig implements WebSocketMessageBrokerConfigurer {
466466

467467
private static final ExpressionParser expressionParser = new SpelExpressionParser();
468468

spring-integration-websocket/src/test/java/org/springframework/integration/websocket/server/WebSocketServerTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2017 the original author or authors.
2+
* Copyright 2014-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -82,9 +82,9 @@
8282
import org.springframework.web.socket.WebSocketSession;
8383
import org.springframework.web.socket.client.WebSocketClient;
8484
import org.springframework.web.socket.client.standard.StandardWebSocketClient;
85-
import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer;
8685
import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
8786
import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
87+
import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
8888
import org.springframework.web.socket.handler.WebSocketHandlerDecorator;
8989
import org.springframework.web.socket.handler.WebSocketHandlerDecoratorFactory;
9090
import org.springframework.web.socket.messaging.StompSubProtocolHandler;
@@ -244,7 +244,7 @@ public MessageHandler webSocketOutboundMessageHandler() {
244244
@Configuration
245245
@EnableIntegration
246246
@EnableWebSocketMessageBroker
247-
static class ServerConfig extends AbstractWebSocketMessageBrokerConfigurer {
247+
static class ServerConfig implements WebSocketMessageBrokerConfigurer {
248248

249249
@Override
250250
public void registerStompEndpoints(StompEndpointRegistry registry) {

0 commit comments

Comments
 (0)