Upgrade to Spring AMQP 2.1 M2

* Add `@SuppressWarnings("serial")` for the `RequestMessageHolder`
* Use non-caching JMS CF for the Inbound endpoints in the `JmsTests`
* Make `AsyncGatewayTests extends ActiveMQMultiContextTests` to keep
embedded broker opened in between test methods

Author: artembilan

build.gradle

@@ -131,7 +131,7 @@ subprojects { subproject ->
 		romeToolsVersion = '1.9.0'
 		servletApiVersion = '4.0.0'
 		smackVersion = '4.2.3'
-		springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.1.0.BUILD-SNAPSHOT'
+		springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.1.0.M2'
 		springDataJpaVersion = '2.1.0.RC2'
 		springDataMongoVersion = '2.1.0.RC2'
 		springDataRedisVersion = '2.1.0.RC2'

spring-integration-core/src/main/java/org/springframework/integration/dsl/Transformers.java

@@ -294,6 +294,8 @@ static <I, O> Flux<Message<O>> transformWithFunction(Publisher<Message<I>> publi
 				.subscriberContext(ctx -> ctx.put(RequestMessageHolder.class, new RequestMessageHolder()));
 	}
 
+
+	@SuppressWarnings("serial")
 	private static class RequestMessageHolder extends AtomicReference<Message<?>> {
 
 	}

spring-integration-jms/src/test/java/org/springframework/integration/jms/dsl/JmsTests.java

@@ -176,7 +176,7 @@ public void testJmsOutboundInboundFlow() {
 		JmsTemplate jmsTemplate =
 				TestUtils.getPropertyValue(this.jmsDestinationPollingSource, "jmsTemplate", JmsTemplate.class);
 
-		assertEquals(JmsTemplate.RECEIVE_TIMEOUT_NO_WAIT, jmsTemplate.getReceiveTimeout());
+		assertEquals(1000, jmsTemplate.getReceiveTimeout());
 
 		this.jmsOutboundInboundChannel.send(MessageBuilder.withPayload("hello THROUGH the JMS")
 				.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "jmsInbound")
@@ -307,7 +307,7 @@ public IntegrationFlow flow1() {
 			return f -> f
 					.fixedSubscriberChannel("integerChannel")
 					.transform("payload.toString()")
-					.channel(Jms.pollableChannel("flow1QueueChannel", cachingConnectionFactory())
+					.channel(Jms.pollableChannel("flow1QueueChannel", jmsConnectionFactory())
 							.destination("flow1QueueChannel"));
 		}
 
@@ -327,7 +327,7 @@ public MessageChannel jmsOutboundInboundReplyChannel() {
 		@Bean
 		public IntegrationFlow jmsInboundFlow() {
 			return IntegrationFlows
-					.from(Jms.inboundAdapter(cachingConnectionFactory()).destination("jmsInbound"))
+					.from(Jms.inboundAdapter(jmsConnectionFactory()).destination("jmsInbound"))
 					.<String, String>transform(String::toUpperCase)
 					.channel(this.jmsOutboundInboundReplyChannel())
 					.get();
@@ -336,7 +336,7 @@ public IntegrationFlow jmsInboundFlow() {
 		@Bean
 		public IntegrationFlow pubSubFlow() {
 			return IntegrationFlows
-					.from(Jms.publishSubscribeChannel(cachingConnectionFactory())
+					.from(Jms.publishSubscribeChannel(jmsConnectionFactory())
 							.destination("pubsub"))
 					.channel(c -> c.queue("jmsPubSubBridgeChannel"))
 					.get();
@@ -430,7 +430,7 @@ public Message<?> preSend(Message<?> message, MessageChannel channel) {
 		@Bean
 		public IntegrationFlow jmsMessageDrivenRedeliveryFlow() {
 			return IntegrationFlows
-					.from(Jms.messageDrivenChannelAdapter(cachingConnectionFactory())
+					.from(Jms.messageDrivenChannelAdapter(jmsConnectionFactory())
 							.errorChannel(IntegrationContextUtils.ERROR_CHANNEL_BEAN_NAME)
 							.destination("jmsMessageDrivenRedelivery")
 							.configureListenerContainer(c -> c

spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/AsyncGatewayTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-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.
@@ -34,6 +34,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.config.EnableIntegration;
+import org.springframework.integration.jms.ActiveMQMultiContextTests;
 import org.springframework.integration.jms.JmsOutboundGateway;
 import org.springframework.integration.jms.JmsTimeoutException;
 import org.springframework.jms.connection.CachingConnectionFactory;
@@ -49,13 +50,15 @@
 
 /**
  * @author Gary Russell
+ * @author Artem Bilan
+ *
  * @since 4.3
  *
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
 @DirtiesContext
-public class AsyncGatewayTests {
+public class AsyncGatewayTests extends ActiveMQMultiContextTests {
 
 	@Autowired
 	private CachingConnectionFactory ccf;