From d86604a56ae4670f26b810f5d70cbb58759c983c Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Sat, 22 Apr 2023 13:42:43 +0300
Subject: [PATCH] [JAVA-19532] Clean up pom files (#13868)

---
 messaging-modules/spring-jms/pom.xml       |  9 ++++---
 microservices-modules/rest-express/pom.xml | 29 +++++++++++++---------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/messaging-modules/spring-jms/pom.xml b/messaging-modules/spring-jms/pom.xml
index 2dee95136d..ef1e0cb3a8 100644
--- a/messaging-modules/spring-jms/pom.xml
+++ b/messaging-modules/spring-jms/pom.xml
@@ -44,19 +44,19 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.6.1</version>
+            <version>${mockito-core.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.activemq.tooling</groupId>
             <artifactId>activemq-junit</artifactId>
-            <version>5.16.5</version>
+            <version>${activemq-junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>1.17.3</version>
+            <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -83,6 +83,9 @@
         <activemq.version>5.14.1</activemq.version>
         <spring-boot-test.version>1.5.10.RELEASE</spring-boot-test.version>
         <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
+        <mockito-core.version>4.6.1</mockito-core.version>
+        <activemq-junit.version>5.16.5</activemq-junit.version>
+        <testcontainers.version>1.17.3</testcontainers.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/microservices-modules/rest-express/pom.xml b/microservices-modules/rest-express/pom.xml
index e3fed19e29..eda27ec164 100644
--- a/microservices-modules/rest-express/pom.xml
+++ b/microservices-modules/rest-express/pom.xml
@@ -23,15 +23,6 @@
     <artifactId>rest-express</artifactId>
     <packaging>jar</packaging>
 
-    <properties>
-        <RestExpress.plugin.version>0.3.3</RestExpress.plugin.version>
-        <metrics-graphite.version>3.1.2</metrics-graphite.version>
-        <HyperExpressPlugin.version>2.6</HyperExpressPlugin.version>
-        <RestExpress.version>0.11.3</RestExpress.version>
-        <Syntaxe.version>1.0</Syntaxe.version>
-        <repoexpress-mongodb.version>0.4.8</repoexpress-mongodb.version>
-        <junit4.version>4.11</junit4.version>
-    </properties>
 
     <dependencies>
         <dependency>
@@ -98,7 +89,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>${exec-maven-plugin.version}</version>
                 <configuration>
                     <mainClass>com.baeldung.restexpress.Main</mainClass>
                 </configuration>
@@ -106,7 +97,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.1</version>
+                <version>${maven-shade-plugin.version}</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <filters>
@@ -140,8 +131,22 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>versions-maven-plugin</artifactId>
-                <version>2.0</version>
+                <version>${versions-maven-plugin.version}</version>
             </plugin>
         </plugins>
     </reporting>
+
+    <properties>
+        <RestExpress.plugin.version>0.3.3</RestExpress.plugin.version>
+        <metrics-graphite.version>3.1.2</metrics-graphite.version>
+        <HyperExpressPlugin.version>2.6</HyperExpressPlugin.version>
+        <RestExpress.version>0.11.3</RestExpress.version>
+        <Syntaxe.version>1.0</Syntaxe.version>
+        <repoexpress-mongodb.version>0.4.8</repoexpress-mongodb.version>
+        <junit4.version>4.11</junit4.version>
+        <exec-maven-plugin.version>1.2.1</exec-maven-plugin.version>
+        <maven-shade-plugin.version>2.4.1</maven-shade-plugin.version>
+        <versions-maven-plugin.version>2.0</versions-maven-plugin.version>
+    </properties>
+
 </project>