From 006b018171705d1a0bfd1390ea9ecfdf534cee46 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@vmware.com>
Date: Sun, 16 Jan 2022 10:11:21 -0500
Subject: [PATCH] Upgrade Versions; Prepare for Milestone Release

---
 build.gradle                                              | 8 ++++----
 .../rabbit/listener/AbstractMessageListenerContainer.java | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 92f189b0..0184a2ee 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,15 +55,15 @@ ext {
 	log4jVersion = '2.17.1'
 	logbackVersion = '1.2.3'
 	lz4Version = '1.8.0'
-	micrometerVersion = '1.8.0'
+	micrometerVersion = '2.0.0-M1'
 	mockitoVersion = '3.11.2'
 	rabbitmqStreamVersion = '0.4.0'
 	rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '5.13.1'
 	rabbitmqHttpClientVersion = '3.12.1'
-	reactorVersion = '2020.0.14'
+	reactorVersion = '2020.0.15'
 	snappyVersion = '1.1.8.4'
-	springDataCommonsVersion = '2.6.0'
-	springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-SNAPSHOT'
+	springDataCommonsVersion = '3.0.0-M1'
+	springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-M2'
 	springRetryVersion = '1.3.1'
 	zstdJniVersion = '1.5.0-2'
 }
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java
index 374f2279..10b191e5 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java
@@ -2139,6 +2139,7 @@ public abstract class AbstractMessageListenerContainer extends RabbitAccessor
 			return Timer.start(this.registry);
 		}
 
+		@SuppressWarnings("deprecation")
 		void success(Object sample, String queue) {
 			Timer timer = this.timers.get(queue + "none");
 			if (timer == null) {
@@ -2147,6 +2148,7 @@ public abstract class AbstractMessageListenerContainer extends RabbitAccessor
 			((Sample) sample).stop(timer);
 		}
 
+		@SuppressWarnings("deprecation")
 		void failure(Object sample, String queue, String exception) {
 			Timer timer = this.timers.get(queue + exception);
 			if (timer == null) {