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

This reverts commit 82675684e8bc52ddee5789f2c3a6df3ca19c866d.
---
 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, 14 insertions(+), 9 deletions(-)

diff --git a/helloworld/pom.xml b/helloworld/pom.xml
index 4787484..d7af835 100644
--- a/helloworld/pom.xml
+++ b/helloworld/pom.xml
@@ -16,6 +16,7 @@
 	</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>
@@ -25,7 +26,7 @@
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
 			<artifactId>spring-rabbit</artifactId>
-			<version>${project.version}</version>
+			<version>${spring.amqp.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/log4j2/pom.xml b/log4j2/pom.xml
index b372a75..7bb8698 100644
--- a/log4j2/pom.xml
+++ b/log4j2/pom.xml
@@ -21,6 +21,7 @@
 	<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>
@@ -43,13 +44,13 @@
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
 			<artifactId>spring-rabbit</artifactId>
-			<version>${project.version}</version>
+			<version>${spring.amqp.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
 			<artifactId>spring-amqp</artifactId>
-			<version>${project.version}</version>
+			<version>${spring.amqp.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/spring-rabbit-confirms-returns/pom.xml b/spring-rabbit-confirms-returns/pom.xml
index c9f166a..49aa2bb 100644
--- a/spring-rabbit-confirms-returns/pom.xml
+++ b/spring-rabbit-confirms-returns/pom.xml
@@ -22,6 +22,7 @@
 		<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>
@@ -33,13 +34,13 @@
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
 			<artifactId>spring-rabbit</artifactId>
-			<version>${project.version}</version>
+			<version>${spring.amqp.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
 			<artifactId>spring-amqp</artifactId>
-			<version>${project.version}</version>
+			<version>${spring.amqp.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/spring-rabbit-global-errorhandler/pom.xml b/spring-rabbit-global-errorhandler/pom.xml
index 47597e6..2f95fb6 100644
--- a/spring-rabbit-global-errorhandler/pom.xml
+++ b/spring-rabbit-global-errorhandler/pom.xml
@@ -22,6 +22,7 @@
 		<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>
@@ -38,13 +39,13 @@
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
 			<artifactId>spring-rabbit</artifactId>
-			<version>${project.version}</version>
+			<version>${spring.amqp.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
 			<artifactId>spring-amqp</artifactId>
-			<version>${project.version}</version>
+			<version>${spring.amqp.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/spring-rabbit-json/pom.xml b/spring-rabbit-json/pom.xml
index 5c82696..68a03c3 100644
--- a/spring-rabbit-json/pom.xml
+++ b/spring-rabbit-json/pom.xml
@@ -22,6 +22,7 @@
 		<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>
@@ -38,13 +39,13 @@
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
 			<artifactId>spring-rabbit</artifactId>
-			<version>${project.version}</version>
+			<version>${spring.amqp.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
 			<artifactId>spring-amqp</artifactId>
-			<version>${project.version}</version>
+			<version>${spring.amqp.version}</version>
 		</dependency>
 
 		<dependency>