From e45bb36be2475d3d1d8431df91a2d6e20693d798 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 13 Nov 2015 15:17:08 -0500 Subject: [PATCH] Upgrade to AMQP-1.5.2 Add `@Qualifier("taskScheduler")` to the `StompInboundChannelAdapterWebSocketIntegrationTests`: https://build.spring.io/browse/INT-B41-JOB1-491 --- build.gradle | 2 +- .../StompInboundChannelAdapterWebSocketIntegrationTests.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 77b4d77e92..4db52b0ea9 100644 --- a/build.gradle +++ b/build.gradle @@ -130,7 +130,7 @@ subprojects { subproject -> tomcatVersion = "8.0.18" smack3Version = '3.2.1' smackVersion = '4.0.6' - springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '1.5.1.RELEASE' + springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '1.5.2.RELEASE' // springCloudClusterVersion = '1.0.0.BUILD-SNAPSHOT' springDataJpaVersion = '1.8.2.RELEASE' springDataMongoVersion = '1.7.2.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 5e8b050de7..326f0e5314 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 @@ -35,7 +35,6 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationListener; import org.springframework.context.ConfigurableApplicationContext; @@ -241,7 +240,7 @@ public class StompInboundChannelAdapterWebSocketIntegrationTests { } @Bean - public WebSocketStompClient stompClient(TaskScheduler taskScheduler) { + public WebSocketStompClient stompClient(@Qualifier("taskScheduler") TaskScheduler taskScheduler) { WebSocketStompClient webSocketStompClient = new WebSocketStompClient(webSocketClient()); webSocketStompClient.setMessageConverter(new MappingJackson2MessageConverter()); webSocketStompClient.setTaskScheduler(taskScheduler);