From 82675684e8bc52ddee5789f2c3a6df3ca19c866d Mon Sep 17 00:00:00 2001
From: Artem Bilan <artem.bilan@broadcom.com>
Date: Thu, 22 Feb 2024 10:52:05 -0500
Subject: [PATCH] Use `${project.version}` for Spring AMQP deps

**Cherry-pick to `3.0.x`**
---
 helloworld/pom.xml                        | 3 +--
 log4j2/pom.xml                            | 5 ++---
 spring-rabbit-confirms-returns/pom.xml    | 5 ++---
 spring-rabbit-global-errorhandler/pom.xml | 5 ++---
 spring-rabbit-json/pom.xml                | 5 ++---
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/helloworld/pom.xml b/helloworld/pom.xml
index d7af835..4787484 100644
--- a/helloworld/pom.xml
+++ b/helloworld/pom.xml
@@ -16,7 +16,6 @@
 	</description>
 	<properties>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
-		<spring.amqp.version>3.1.0</spring.amqp.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>17</java.version>
 		<maven.test.failure.ignore>false</maven.test.failure.ignore>
@@ -26,7 +25,7 @@
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
 			<artifactId>spring-rabbit</artifactId>
-			<version>${spring.amqp.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/log4j2/pom.xml b/log4j2/pom.xml
index 7bb8698..b372a75 100644
--- a/log4j2/pom.xml
+++ b/log4j2/pom.xml
@@ -21,7 +21,6 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>17</java.version>
-		<spring.amqp.version>3.1.0</spring.amqp.version>
 	</properties>
 
 	<dependencies>
@@ -44,13 +43,13 @@
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
 			<artifactId>spring-rabbit</artifactId>
-			<version>${spring.amqp.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
 			<artifactId>spring-amqp</artifactId>
-			<version>${spring.amqp.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/spring-rabbit-confirms-returns/pom.xml b/spring-rabbit-confirms-returns/pom.xml
index 49aa2bb..c9f166a 100644
--- a/spring-rabbit-confirms-returns/pom.xml
+++ b/spring-rabbit-confirms-returns/pom.xml
@@ -22,7 +22,6 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>17</java.version>
-		<spring.amqp.version>3.1.0</spring.amqp.version>
 	</properties>
 
 	<dependencies>
@@ -34,13 +33,13 @@
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
 			<artifactId>spring-rabbit</artifactId>
-			<version>${spring.amqp.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
 			<artifactId>spring-amqp</artifactId>
-			<version>${spring.amqp.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/spring-rabbit-global-errorhandler/pom.xml b/spring-rabbit-global-errorhandler/pom.xml
index 2f95fb6..47597e6 100644
--- a/spring-rabbit-global-errorhandler/pom.xml
+++ b/spring-rabbit-global-errorhandler/pom.xml
@@ -22,7 +22,6 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>17</java.version>
-		<spring.amqp.version>3.1.0</spring.amqp.version>
 	</properties>
 
 	<dependencies>
@@ -39,13 +38,13 @@
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
 			<artifactId>spring-rabbit</artifactId>
-			<version>${spring.amqp.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
 			<artifactId>spring-amqp</artifactId>
-			<version>${spring.amqp.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/spring-rabbit-json/pom.xml b/spring-rabbit-json/pom.xml
index 68a03c3..5c82696 100644
--- a/spring-rabbit-json/pom.xml
+++ b/spring-rabbit-json/pom.xml
@@ -22,7 +22,6 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>17</java.version>
-		<spring.amqp.version>3.1.0</spring.amqp.version>
 	</properties>
 
 	<dependencies>
@@ -39,13 +38,13 @@
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
 			<artifactId>spring-rabbit</artifactId>
-			<version>${spring.amqp.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
 			<artifactId>spring-amqp</artifactId>
-			<version>${spring.amqp.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>