diff --git a/build.gradle b/build.gradle index b7a227d85d..2088ed68c5 100644 --- a/build.gradle +++ b/build.gradle @@ -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' diff --git a/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/inbound/StompInboundChannelAdapterWebSocketIntegrationTests.java b/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/inbound/StompInboundChannelAdapterWebSocketIntegrationTests.java index e7e5586442..105359a578 100644 --- a/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/inbound/StompInboundChannelAdapterWebSocketIntegrationTests.java +++ b/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/inbound/StompInboundChannelAdapterWebSocketIntegrationTests.java @@ -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() { diff --git a/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/outbound/StompMessageHandlerWebSocketIntegrationTests.java b/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/outbound/StompMessageHandlerWebSocketIntegrationTests.java index 674ac206d6..fc41bcaf38 100644 --- a/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/outbound/StompMessageHandlerWebSocketIntegrationTests.java +++ b/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/outbound/StompMessageHandlerWebSocketIntegrationTests.java @@ -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() { diff --git a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/client/StompIntegrationTests.java b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/client/StompIntegrationTests.java index 0edf60c8dd..0204700bfc 100644 --- a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/client/StompIntegrationTests.java +++ b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/client/StompIntegrationTests.java @@ -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(); diff --git a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/server/WebSocketServerTests.java b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/server/WebSocketServerTests.java index 3f60bc1940..2a1dd48e56 100644 --- a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/server/WebSocketServerTests.java +++ b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/server/WebSocketServerTests.java @@ -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) {