Fix deprecation for TX; fix JMS tests; Moore-SR6

* Upgrade to Spring Data Moore-SR6
* Fix `TransactionHandleMessageAdvice` and `TransactionInterceptorBuilder`
for deprecations in the `TransactionInterceptor`
* Fix `TransactionHandleMessageAdvice` and `TransactionInterceptorBuilder`
consumers to expose new `TransactionManager`-based options and
deprecate `PlatformTransactionManager`-based
* Fix failing JMS tests to reuse an ActiveMQ Connection Factory with a
`trustedPackaged(*)`

**Cherry-pick to master**

Author: artembilan

build.gradle

@@ -90,7 +90,7 @@ ext {
 	servletApiVersion = '4.0.1'
 	smackVersion = '4.3.4'
 	springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.2.5.RELEASE'
-	springDataVersion = 'Moore-SR5'
+	springDataVersion = 'Moore-SR6'
 	springSecurityVersion = '5.2.2.RELEASE'
 	springRetryVersion = '1.2.5.RELEASE'
 	springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.5.RELEASE'

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 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.
@@ -32,6 +32,7 @@
 import org.springframework.messaging.MessageHandler;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionManager;
 import org.springframework.transaction.interceptor.TransactionInterceptor;
 import org.springframework.util.Assert;
 
@@ -114,8 +115,23 @@ public S advice(Advice... advice) {
 	 * for the {@link MessageHandler}.
 	 * @param transactionManager the {@link PlatformTransactionManager} to use.
 	 * @return the spec.
+	 * @deprecated since 5.2.5 in favor of {@link #transactional(TransactionManager)}
 	 */
+	@Deprecated
 	public S transactional(PlatformTransactionManager transactionManager) {
+		return transactional((TransactionManager) transactionManager);
+	}
+
+	/**
+	 * Specify a {@link TransactionInterceptor} {@link Advice} with the provided
+	 * {@code PlatformTransactionManager} and default
+	 * {@link org.springframework.transaction.interceptor.DefaultTransactionAttribute}
+	 * for the {@link MessageHandler}.
+	 * @param transactionManager the {@link TransactionManager} to use.
+	 * @return the spec.
+	 * @since 5.2.5
+	 */
+	public S transactional(TransactionManager transactionManager) {
 		return transactional(transactionManager, false);
 	}
 
@@ -130,8 +146,27 @@ public S transactional(PlatformTransactionManager transactionManager) {
 	 * {@link org.springframework.integration.transaction.TransactionHandleMessageAdvice}
 	 * extension.
 	 * @return the spec.
+	 * @deprecated since 5.2.5 in favor of {@link #transactional(TransactionManager, boolean)}
 	 */
+	@Deprecated
 	public S transactional(PlatformTransactionManager transactionManager, boolean handleMessageAdvice) {
+		return transactional((TransactionManager) transactionManager, handleMessageAdvice);
+	}
+
+	/**
+	 * Specify a {@link TransactionInterceptor} {@link Advice} with the provided
+	 * {@code PlatformTransactionManager} and default
+	 * {@link org.springframework.transaction.interceptor.DefaultTransactionAttribute}
+	 * for the {@link MessageHandler}.
+	 * @param transactionManager the {@link TransactionManager} to use.
+	 * @param handleMessageAdvice the flag to indicate the target {@link Advice} type:
+	 * {@code false} - regular {@link TransactionInterceptor}; {@code true} -
+	 * {@link org.springframework.integration.transaction.TransactionHandleMessageAdvice}
+	 * extension.
+	 * @return the spec.
+	 * @since 5.2.5
+	 */
+	public S transactional(TransactionManager transactionManager, boolean handleMessageAdvice) {
 		return transactional(new TransactionInterceptorBuilder(handleMessageAdvice)
 				.transactionManager(transactionManager)
 				.build());

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 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.
@@ -31,6 +31,7 @@
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionManager;
 import org.springframework.transaction.interceptor.TransactionInterceptor;
 import org.springframework.util.Assert;
 
@@ -193,14 +194,29 @@ public DelayerEndpointSpec transactionalRelease(TransactionInterceptor transacti
 
 	/**
 	 * Specify a {@link TransactionInterceptor} {@link Advice} with the provided
-	 * {@code PlatformTransactionManager} and default
+	 * {@link PlatformTransactionManager} and default
 	 * {@link org.springframework.transaction.interceptor.DefaultTransactionAttribute}
 	 * for the {@link org.springframework.messaging.MessageHandler}.
 	 * @param transactionManager the {@link PlatformTransactionManager} to use.
 	 * @return the spec.
 	 * @since 5.0.8
+	 * @deprecated since 5.2.5 in favor of {@link #transactionalRelease(TransactionManager)}
 	 */
+	@Deprecated
 	public DelayerEndpointSpec transactionalRelease(PlatformTransactionManager transactionManager) {
+		return transactionalRelease((TransactionManager) transactionManager);
+	}
+
+	/**
+	 * Specify a {@link TransactionInterceptor} {@link Advice} with the provided
+	 * {@link TransactionManager} and default
+	 * {@link org.springframework.transaction.interceptor.DefaultTransactionAttribute}
+	 * for the {@link org.springframework.messaging.MessageHandler}.
+	 * @param transactionManager the {@link TransactionManager} to use.
+	 * @return the spec.
+	 * @since 5.2.5
+	 */
+	public DelayerEndpointSpec transactionalRelease(TransactionManager transactionManager) {
 		return transactionalRelease(
 				new TransactionInterceptorBuilder()
 						.transactionManager(transactionManager)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 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.
@@ -32,6 +32,7 @@
 import org.springframework.messaging.MessageChannel;
 import org.springframework.scheduling.Trigger;
 import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionManager;
 import org.springframework.transaction.interceptor.TransactionInterceptor;
 import org.springframework.util.ErrorHandler;
 
@@ -144,13 +145,28 @@ public PollerSpec advice(Advice... advice) {
 
 	/**
 	 * Specify a {@link TransactionInterceptor} {@link Advice} with the
-	 * provided {@code PlatformTransactionManager} and default
+	 * provided {@link PlatformTransactionManager} and default
 	 * {@link org.springframework.transaction.interceptor.DefaultTransactionAttribute}
 	 * for the {@code pollingTask}.
 	 * @param transactionManager the {@link PlatformTransactionManager} to use.
 	 * @return the spec.
+	 * @deprecated since 5.2.5 in favor of {@link #transactional(TransactionManager)}
 	 */
+	@Deprecated
 	public PollerSpec transactional(PlatformTransactionManager transactionManager) {
+		return transactional((TransactionManager) transactionManager);
+	}
+
+	/**
+	 * Specify a {@link TransactionInterceptor} {@link Advice} with the
+	 * provided {@link TransactionManager} and default
+	 * {@link org.springframework.transaction.interceptor.DefaultTransactionAttribute}
+	 * for the {@code pollingTask}.
+	 * @param transactionManager the {@link TransactionManager} to use.
+	 * @return the spec.
+	 * @since 5.2.5
+	 */
+	public PollerSpec transactional(TransactionManager transactionManager) {
 		return transactional(new TransactionInterceptorBuilder()
 				.transactionManager(transactionManager)
 				.build());

spring-integration-core/src/main/java/org/springframework/integration/transaction/TransactionHandleMessageAdvice.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 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.
@@ -20,6 +20,7 @@
 
 import org.springframework.integration.handler.advice.HandleMessageAdvice;
 import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionManager;
 import org.springframework.transaction.interceptor.TransactionAttributeSource;
 import org.springframework.transaction.interceptor.TransactionInterceptor;
 
@@ -46,12 +47,42 @@ public class TransactionHandleMessageAdvice extends TransactionInterceptor imple
 	public TransactionHandleMessageAdvice() {
 	}
 
+	/**
+	 * Create a new TransactionHandleMessageAdvice.
+	 * @param transactionManager the default transaction manager to perform the actual transaction management
+	 * @param transactionAttributeSource the attribute source to be used to find transaction attributes
+	 * @since 5.2.5
+	 * @see TransactionInterceptor
+	 */
+	public TransactionHandleMessageAdvice(TransactionManager transactionManager,
+			TransactionAttributeSource transactionAttributeSource) {
+
+		super(transactionManager, transactionAttributeSource);
+	}
+
+	/**
+	 * Create a new TransactionHandleMessageAdvice.
+	 * @param ptm the default transaction manager to perform the actual transaction management
+	 * @param attributes the attribute source to be used to find transaction attributes
+	 * @deprecated since 5.2.5 in favor of {@link #TransactionHandleMessageAdvice()}
+	 * and {@link #setTransactionManager(TransactionManager)}, {@link #setTransactionAttributes(Properties)}
+	 */
+	@Deprecated
 	public TransactionHandleMessageAdvice(PlatformTransactionManager ptm, Properties attributes) {
-		super(ptm, attributes);
+		setTransactionManager(ptm);
+		setTransactionAttributes(attributes);
 	}
 
+	/**
+	 * Create a new TransactionHandleMessageAdvice.
+	 * @param ptm the default transaction manager to perform the actual transaction management
+	 * @param tas the attribute source to be used to find transaction attributes
+	 * @deprecated since 5.2.5 in favor of
+	 * {@link #TransactionHandleMessageAdvice(TransactionManager, TransactionAttributeSource)}
+	 */
+	@Deprecated
 	public TransactionHandleMessageAdvice(PlatformTransactionManager ptm, TransactionAttributeSource tas) {
-		super(ptm, tas);
+		this((TransactionManager) ptm, tas);
 	}
 
 }

spring-integration-core/src/main/java/org/springframework/integration/transaction/TransactionInterceptorBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 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.
@@ -17,6 +17,7 @@
 package org.springframework.integration.transaction;
 
 import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionManager;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.interceptor.DefaultTransactionAttribute;
@@ -91,11 +92,27 @@ public final TransactionInterceptorBuilder transactionAttribute(TransactionAttri
 		return this;
 	}
 
-	public TransactionInterceptorBuilder transactionManager(PlatformTransactionManager transactionManager) {
+	/**
+	 * Provide a {@link TransactionManager} instance to use.
+	 * @param transactionManager the {@link TransactionManager} to use
+	 * @return the builder
+	 */
+	public TransactionInterceptorBuilder transactionManager(TransactionManager transactionManager) {
 		this.transactionInterceptor.setTransactionManager(transactionManager);
 		return this;
 	}
 
+	/**
+	 * Provide a {@link PlatformTransactionManager} instance to use.
+	 * @param transactionManager the {@link PlatformTransactionManager} to use
+	 * @return the builder
+	 * @deprecated since 5.2.5 in favor of {@link #transactionManager(TransactionManager)}
+	 */
+	@Deprecated
+	public TransactionInterceptorBuilder transactionManager(PlatformTransactionManager transactionManager) {
+		return transactionManager((TransactionManager) transactionManager);
+	}
+
 	public TransactionInterceptor build() {
 		return this.transactionInterceptor;
 	}

spring-integration-core/src/test/java/org/springframework/integration/transaction/TransactionInterceptorBuilderTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 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.
@@ -26,6 +26,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionManager;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.interceptor.TransactionAttribute;
@@ -75,7 +76,7 @@ public PseudoTransactionManager transactionManager() {
 		}
 
 		@Bean
-		public TransactionInterceptor interceptor1(PlatformTransactionManager transactionManager) {
+		public TransactionInterceptor interceptor1(TransactionManager transactionManager) {
 			return new TransactionInterceptorBuilder()
 					.propagation(Propagation.REQUIRES_NEW)
 					.isolation(Isolation.SERIALIZABLE)

spring-integration-jms/src/test/java/org/springframework/integration/jms/ActiveMQMultiContextTests.java

@@ -35,10 +35,10 @@
  */
 public abstract class ActiveMQMultiContextTests {
 
-	protected static final ActiveMQConnectionFactory amqFactory =
+	public static final ActiveMQConnectionFactory amqFactory =
 			new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");
 
-	protected static final CachingConnectionFactory connectionFactory =
+	public static final CachingConnectionFactory connectionFactory =
 			new CachingConnectionFactory(amqFactory);
 
 	@BeforeClass

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.

spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-01.xml

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:int="http://www.springframework.org/schema/integration"
-	xmlns:int-jms="http://www.springframework.org/schema/integration/jms"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:int="http://www.springframework.org/schema/integration"
+	   xmlns:int-jms="http://www.springframework.org/schema/integration/jms"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
 		http://www.springframework.org/schema/integration/jms https://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd
-		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd">
 
 	<int:gateway default-request-channel="pipeline01" default-request-timeout="10000" default-reply-timeout="10000"/>
 
 	<int-jms:outbound-gateway request-channel="pipeline01"
-		connection-factory="jmsConnectionFactory"
 		receive-timeout="10000"
 		request-destination-name="pipeline01-queue-01">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
 
 	<int-jms:inbound-gateway request-channel="jmsIn"
 		request-destination-name="pipeline01-queue-01"
-		connection-factory="jmsConnectionFactory"
 		concurrent-consumers="10"
 		reply-timeout="10000"/>
 
@@ -31,30 +31,19 @@
 	</int:chain>
 
 	<int-jms:outbound-gateway request-channel="anotherGatewayChannel"
-		connection-factory="jmsConnectionFactory"
 		receive-timeout="10000"
 		request-destination-name="pipeline01-queue-02">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
 
 	<int-jms:inbound-gateway request-channel="anotherIn"
 		request-destination-name="pipeline01-queue-02"
-		connection-factory="jmsConnectionFactory"
 		concurrent-consumers="10"
 		reply-timeout="10000"/>
 
 	<int:transformer input-channel="anotherIn" expression="payload"/>
 
-	<bean id="jmsConnectionFactory"
-		class="org.springframework.jms.connection.CachingConnectionFactory">
-		<property name="targetConnectionFactory">
-			<bean class="org.apache.activemq.ActiveMQConnectionFactory">
-				<property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
-			</bean>
-		</property>
-		<property name="sessionCacheSize" value="10"/>
-		<property name="cacheProducers" value="true" />
-		<property name="cacheConsumers" value="true" />
-	</bean>
+	<util:constant id="jmsConnectionFactory"
+				   static-field="org.springframework.integration.jms.ActiveMQMultiContextTests.connectionFactory"/>
 
 </beans>