Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix deprecation from SF-5.0.3

Browse Source 
* Upgrade to Spring Data Key SR3, Reactor-3.1.3, Reactor Netty-0.7.3
This commit is contained in:
Artem Bilan
2018-01-24 11:13:01 -05:00
parent 534bb6cd37
commit aca79f842d
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
build.gradle
View File

@@ -123,16 +123,16 @@ subprojects { subproject ->
mysqlVersion = '6.0.6'
pahoMqttClientVersion = '1.2.0'
postgresVersion = '42.0.0'
reactorNettyVersion = '0.7.2.RELEASE'
reactorVersion = '3.1.2.RELEASE'
reactorNettyVersion = '0.7.3.RELEASE'
reactorVersion = '3.1.3.RELEASE'
romeToolsVersion = '1.8.0'
servletApiVersion = '4.0.0'
smackVersion = '4.2.2'
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.1.RELEASE'
springDataJpaVersion = '2.0.2.RELEASE'
springDataMongoVersion = '2.0.2.RELEASE'
springDataRedisVersion = '2.0.2.RELEASE'
springGemfireVersion = '2.0.2.RELEASE'
springDataJpaVersion = '2.0.3.RELEASE'
springDataMongoVersion = '2.0.3.RELEASE'
springDataRedisVersion = '2.0.3.RELEASE'
springGemfireVersion = '2.0.3.RELEASE'
springSecurityVersion = '5.0.0.RELEASE'
springSocialTwitterVersion = '1.1.2.RELEASE'
springRetryVersion = '1.2.1.RELEASE'

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

@@ -77,9 +77,9 @@ import org.springframework.web.socket.WebSocketHandler;
import org.springframework.web.socket.WebSocketHttpHeaders;
import org.springframework.web.socket.client.WebSocketClient;
import org.springframework.web.socket.client.standard.StandardWebSocketClient;
import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer;
import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
import org.springframework.web.socket.messaging.SessionSubscribeEvent;
import org.springframework.web.socket.messaging.WebSocketStompClient;
import org.springframework.web.socket.server.HandshakeInterceptor;
@@ -321,7 +321,7 @@ public class StompInboundChannelAdapterWebSocketIntegrationTests {
@Configuration
@EnableWebSocketMessageBroker
static class ServerConfig extends AbstractWebSocketMessageBrokerConfigurer {
static class ServerConfig implements WebSocketMessageBrokerConfigurer {
@Bean
public DefaultHandshakeHandler handshakeHandler() {

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

@@ -79,9 +79,9 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.web.socket.client.WebSocketClient;
import org.springframework.web.socket.client.standard.StandardWebSocketClient;
import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer;
import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
import org.springframework.web.socket.messaging.WebSocketStompClient;
import org.springframework.web.socket.server.standard.TomcatRequestUpgradeStrategy;
import org.springframework.web.socket.server.support.DefaultHandshakeHandler;
@@ -252,7 +252,7 @@ public class StompMessageHandlerWebSocketIntegrationTests {
basePackageClasses = StompMessageHandlerWebSocketIntegrationTests.class,
useDefaultFilters = false,
includeFilters = @ComponentScan.Filter(IntegrationTestController.class))
static class ServerConfig extends AbstractWebSocketMessageBrokerConfigurer {
static class ServerConfig implements WebSocketMessageBrokerConfigurer {
@Bean
public DefaultHandshakeHandler handshakeHandler() {

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

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2017 the original author or authors.
* Copyright 2014-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -88,9 +88,9 @@ import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.MultiValueMap;
import org.springframework.web.socket.client.WebSocketClient;
import org.springframework.web.socket.client.standard.StandardWebSocketClient;
import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer;
import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
import org.springframework.web.socket.messaging.AbstractSubProtocolEvent;
import org.springframework.web.socket.messaging.SessionConnectedEvent;
import org.springframework.web.socket.messaging.SessionSubscribeEvent;
@@ -462,7 +462,7 @@ public class StompIntegrationTests {
useDefaultFilters = false,
includeFilters = @ComponentScan.Filter(IntegrationTestController.class))
@IntegrationComponentScan
static class ServerConfig extends AbstractWebSocketMessageBrokerConfigurer {
static class ServerConfig implements WebSocketMessageBrokerConfigurer {
private static final ExpressionParser expressionParser = new SpelExpressionParser();

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

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2017 the original author or authors.
* Copyright 2014-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -82,9 +82,9 @@ import org.springframework.web.socket.WebSocketMessage;
import org.springframework.web.socket.WebSocketSession;
import org.springframework.web.socket.client.WebSocketClient;
import org.springframework.web.socket.client.standard.StandardWebSocketClient;
import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer;
import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
import org.springframework.web.socket.handler.WebSocketHandlerDecorator;
import org.springframework.web.socket.handler.WebSocketHandlerDecoratorFactory;
import org.springframework.web.socket.messaging.StompSubProtocolHandler;
@@ -244,7 +244,7 @@ public class WebSocketServerTests {
@Configuration
@EnableIntegration
@EnableWebSocketMessageBroker
static class ServerConfig extends AbstractWebSocketMessageBrokerConfigurer {
static class ServerConfig implements WebSocketMessageBrokerConfigurer {
@Override
public void registerStompEndpoints(StompEndpointRegistry registry) {