From 5d0a1ee0da24aa8dbc0c614384006b94bdc22f27 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Fri, 21 Sep 2018 19:16:08 +0100
Subject: [PATCH] Upgrade to Spring AMQP 2.1.0.RC1

Closes gh-14574
---
 .../amqp/AbstractRabbitListenerContainerFactoryConfigurer.java  | 2 +-
 spring-boot-project/spring-boot-dependencies/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/AbstractRabbitListenerContainerFactoryConfigurer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/AbstractRabbitListenerContainerFactoryConfigurer.java
index d271bc0fea4..2a092caf275 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/AbstractRabbitListenerContainerFactoryConfigurer.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/AbstractRabbitListenerContainerFactoryConfigurer.java
@@ -119,7 +119,7 @@ public abstract class AbstractRabbitListenerContainerFactoryConfigurer<T extends
 		factory.setMissingQueuesFatal(configuration.isMissingQueuesFatal());
 		ListenerRetry retryConfig = configuration.getRetry();
 		if (retryConfig.isEnabled()) {
-			RetryInterceptorBuilder<?> builder = (retryConfig.isStateless())
+			RetryInterceptorBuilder<?, ?> builder = (retryConfig.isStateless())
 					? RetryInterceptorBuilder.stateless()
 					: RetryInterceptorBuilder.stateful();
 			RetryTemplate retryTemplate = new RetryTemplateFactory(
diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 29dc3d35a3d..3a51c3411e4 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -158,7 +158,7 @@
 		<solr.version>7.4.0</solr.version>
 		<!-- deprecated in favor of "spring-framework.version" -->
 		<spring.version>5.1.0.RELEASE</spring.version>
-		<spring-amqp.version>2.1.0.M3</spring-amqp.version>
+		<spring-amqp.version>2.1.0.RC1</spring-amqp.version>
 		<spring-batch.version>4.1.0.M3</spring-batch.version>
 		<spring-cloud-connectors.version>2.0.3.RELEASE</spring-cloud-connectors.version>
 		<spring-data-releasetrain.version>Lovelace-RELEASE</spring-data-releasetrain.version>