From 8e4fc65d3903f7b7f2844688172d85d48a617f11 Mon Sep 17 00:00:00 2001
From: Artem Bilan <artem.bilan@broadcom.com>
Date: Thu, 22 Feb 2024 16:55:17 -0500
Subject: [PATCH] Use `spring-amqp.version` from Spring Boot

---
 helloworld/pom.xml                        |  4 ++--
 log4j2/pom.xml                            | 14 +-------------
 spring-rabbit-confirms-returns/pom.xml    | 14 +-------------
 spring-rabbit-global-errorhandler/pom.xml | 14 +-------------
 spring-rabbit-json/pom.xml                | 14 +-------------
 5 files changed, 6 insertions(+), 54 deletions(-)

diff --git a/helloworld/pom.xml b/helloworld/pom.xml
index d7af835..f26b2d2 100644
--- a/helloworld/pom.xml
+++ b/helloworld/pom.xml
@@ -16,7 +16,7 @@
 	</description>
 	<properties>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
-		<spring.amqp.version>3.1.0</spring.amqp.version>
+		<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 +26,7 @@
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
 			<artifactId>spring-rabbit</artifactId>
-			<version>${spring.amqp.version}</version>
+			<version>${spring-amqp.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/log4j2/pom.xml b/log4j2/pom.xml
index 7bb8698..908bda3 100644
--- a/log4j2/pom.xml
+++ b/log4j2/pom.xml
@@ -21,7 +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>
+		<spring-amqp.version>3.1.0</spring-amqp.version>
 	</properties>
 
 	<dependencies>
@@ -41,18 +41,6 @@
 			<artifactId>spring-boot-starter-log4j2</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework.amqp</groupId>
-			<artifactId>spring-rabbit</artifactId>
-			<version>${spring.amqp.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.amqp</groupId>
-			<artifactId>spring-amqp</artifactId>
-			<version>${spring.amqp.version}</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-jcl</artifactId>
diff --git a/spring-rabbit-confirms-returns/pom.xml b/spring-rabbit-confirms-returns/pom.xml
index 49aa2bb..489589c 100644
--- a/spring-rabbit-confirms-returns/pom.xml
+++ b/spring-rabbit-confirms-returns/pom.xml
@@ -22,7 +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>
+		<spring-amqp.version>3.1.0</spring-amqp.version>
 	</properties>
 
 	<dependencies>
@@ -31,18 +31,6 @@
 			<artifactId>spring-boot-starter-amqp</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework.amqp</groupId>
-			<artifactId>spring-rabbit</artifactId>
-			<version>${spring.amqp.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.amqp</groupId>
-			<artifactId>spring-amqp</artifactId>
-			<version>${spring.amqp.version}</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/spring-rabbit-global-errorhandler/pom.xml b/spring-rabbit-global-errorhandler/pom.xml
index 2f95fb6..91d5d26 100644
--- a/spring-rabbit-global-errorhandler/pom.xml
+++ b/spring-rabbit-global-errorhandler/pom.xml
@@ -22,7 +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>
+		<spring-amqp.version>3.1.0</spring-amqp.version>
 	</properties>
 
 	<dependencies>
@@ -36,18 +36,6 @@
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework.amqp</groupId>
-			<artifactId>spring-rabbit</artifactId>
-			<version>${spring.amqp.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.amqp</groupId>
-			<artifactId>spring-amqp</artifactId>
-			<version>${spring.amqp.version}</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/spring-rabbit-json/pom.xml b/spring-rabbit-json/pom.xml
index 68a03c3..772f352 100644
--- a/spring-rabbit-json/pom.xml
+++ b/spring-rabbit-json/pom.xml
@@ -22,7 +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>
+		<spring-amqp.version>3.1.0</spring-amqp.version>
 	</properties>
 
 	<dependencies>
@@ -36,18 +36,6 @@
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework.amqp</groupId>
-			<artifactId>spring-rabbit</artifactId>
-			<version>${spring.amqp.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.amqp</groupId>
-			<artifactId>spring-amqp</artifactId>
-			<version>${spring.amqp.version}</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>