From f25c016cc290e3df835ee1c7618c53915d97f97f Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Wed, 19 Jul 2023 15:13:21 +0300
Subject: [PATCH] [JAVA-22621] Clean up (#14433)

* [JAVA-22621] Clean up

* [JAVA-22621] Clean up
---
 spring-aop-2/pom.xml                               |  4 ----
 spring-batch/pom.xml                               |  3 ++-
 .../spring-boot-3-observation/pom.xml              |  3 ++-
 .../spring-boot-3-test-pitfalls/pom.xml            |  3 ++-
 .../spring-boot-3-url-matching/pom.xml             | 13 ++++++++-----
 spring-boot-modules/spring-boot-3/pom.xml          |  3 ++-
 spring-boot-modules/spring-boot-artifacts/pom.xml  |  3 ++-
 spring-boot-modules/spring-boot-aws/pom.xml        | 10 ++++++----
 .../spring-boot-basic-customization/pom.xml        | 14 ++++++++------
 9 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/spring-aop-2/pom.xml b/spring-aop-2/pom.xml
index e4748cdcbf..056e248a3c 100644
--- a/spring-aop-2/pom.xml
+++ b/spring-aop-2/pom.xml
@@ -51,8 +51,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <aspectj-plugin.version>1.14.0</aspectj-plugin.version>
-    </properties>
-
 </project>
\ No newline at end of file
diff --git a/spring-batch/pom.xml b/spring-batch/pom.xml
index 810ddcdcdd..7d9becf089 100644
--- a/spring-batch/pom.xml
+++ b/spring-batch/pom.xml
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>4.0.0</version>
+            <version>${jakarta.xml.bind-api}</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
@@ -75,6 +75,7 @@
     <properties>
         <spring.version>6.0.6</spring.version>
         <opencsv.version>5.7.1</opencsv.version>
+        <jakarta.xml.bind-api>4.0.0</jakarta.xml.bind-api>
         <jaxb.version>4.0.2</jaxb.version>
         <jackson-datatype.version>2.14.2</jackson-datatype.version>
         <http-client.version>4.5.14</http-client.version>
diff --git a/spring-boot-modules/spring-boot-3-observation/pom.xml b/spring-boot-modules/spring-boot-3-observation/pom.xml
index f69ce699bc..b0d179e365 100644
--- a/spring-boot-modules/spring-boot-3-observation/pom.xml
+++ b/spring-boot-modules/spring-boot-3-observation/pom.xml
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>com.github.gavlyukovskiy</groupId>
             <artifactId>p6spy-spring-boot-starter</artifactId>
-            <version>1.9.0</version>
+            <version>${p6spy-spring-boot-starter.version}</version>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -84,6 +84,7 @@
 
     <properties>
         <start-class>com.baeldung.samples.SimpleObservationApplication</start-class>
+        <p6spy-spring-boot-starter.version>1.9.0</p6spy-spring-boot-starter.version>
     </properties>
 
 </project>
diff --git a/spring-boot-modules/spring-boot-3-test-pitfalls/pom.xml b/spring-boot-modules/spring-boot-3-test-pitfalls/pom.xml
index f3ed67e87b..4aa4ab470b 100644
--- a/spring-boot-modules/spring-boot-3-test-pitfalls/pom.xml
+++ b/spring-boot-modules/spring-boot-3-test-pitfalls/pom.xml
@@ -69,7 +69,7 @@
                             <path>
                                 <groupId>org.projectlombok</groupId>
                                 <artifactId>lombok-mapstruct-binding</artifactId>
-                                <version>0.2.0</version>
+                                <version>${lombok-mapstruct-binding.version}</version>
                             </path>
                         </annotationProcessorPaths>
                     </configuration>
@@ -80,6 +80,7 @@
 
     <properties>
         <org.mapstruct.version>1.5.3.Final</org.mapstruct.version>
+        <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
         <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
     </properties>
 
diff --git a/spring-boot-modules/spring-boot-3-url-matching/pom.xml b/spring-boot-modules/spring-boot-3-url-matching/pom.xml
index 0ed6fdbd9b..aa83a676d7 100644
--- a/spring-boot-modules/spring-boot-3-url-matching/pom.xml
+++ b/spring-boot-modules/spring-boot-3-url-matching/pom.xml
@@ -46,13 +46,13 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>6.0.6</version>
+            <version>${spring-test.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
+            <version>${javax.servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -62,12 +62,12 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
-            <version>3.5.4</version>
+            <version>${reactor-core.version}</version>
         </dependency>
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
-            <version>3.5.4</version>
+            <version>${reactor-test.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -78,7 +78,6 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-
                 </plugin>
                 <plugin>
                     <groupId>org.springframework.boot</groupId>
@@ -95,6 +94,10 @@
     </build>
 
     <properties>
+        <spring-test.version>6.0.6</spring-test.version>
+        <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
+        <reactor-core.version>3.5.4</reactor-core.version>
+        <reactor-test.version>3.5.4></reactor-test.version>
         <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
     </properties>
 
diff --git a/spring-boot-modules/spring-boot-3/pom.xml b/spring-boot-modules/spring-boot-3/pom.xml
index 8fe995ca91..369ba30b5a 100644
--- a/spring-boot-modules/spring-boot-3/pom.xml
+++ b/spring-boot-modules/spring-boot-3/pom.xml
@@ -107,7 +107,7 @@
                             <path>
                                 <groupId>org.projectlombok</groupId>
                                 <artifactId>lombok-mapstruct-binding</artifactId>
-                                <version>0.2.0</version>
+                                <version>${lombok-mapstruct-binding.version}</version>
                             </path>
                         </annotationProcessorPaths>
                     </configuration>
@@ -149,6 +149,7 @@
         <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
         <start-class>com.baeldung.sample.TodoApplication</start-class>
         <mockserver.version>5.14.0</mockserver.version>
+        <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-artifacts/pom.xml b/spring-boot-modules/spring-boot-artifacts/pom.xml
index 996ed92014..dedeb0ab2a 100644
--- a/spring-boot-modules/spring-boot-artifacts/pom.xml
+++ b/spring-boot-modules/spring-boot-artifacts/pom.xml
@@ -99,7 +99,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.18</version>
+                <version>${maven-failsafe-plugin.version}</version>
                 <executions>
                     <!-- Invokes both the integration-test and the verify goals of the -->
                     <!-- Failsafe Maven plugin -->
@@ -193,6 +193,7 @@
         <git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
         <subethasmtp.version>3.1.7</subethasmtp.version>
         <httpclient.version>4.5.8</httpclient.version>
+        <maven-failsafe-plugin.version>2.18</maven-failsafe-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-aws/pom.xml b/spring-boot-modules/spring-boot-aws/pom.xml
index 2abce7df76..12a65908af 100644
--- a/spring-boot-modules/spring-boot-aws/pom.xml
+++ b/spring-boot-modules/spring-boot-aws/pom.xml
@@ -14,9 +14,6 @@
         <artifactId>spring-boot-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
-    <properties>
-        <springboot2.aws.version>1.9.1</springboot2.aws.version>
-    </properties>
 
     <dependencies>
         <dependency>
@@ -43,7 +40,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>${maven-shade-plugin.version}</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                 </configuration>
@@ -74,4 +71,9 @@
         </plugins>
     </build>
 
+    <properties>
+        <springboot2.aws.version>1.9.1</springboot2.aws.version>
+        <maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-basic-customization/pom.xml b/spring-boot-modules/spring-boot-basic-customization/pom.xml
index 20b2980f29..4b1009d38a 100644
--- a/spring-boot-modules/spring-boot-basic-customization/pom.xml
+++ b/spring-boot-modules/spring-boot-basic-customization/pom.xml
@@ -34,11 +34,6 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <!-- The main class to start by executing "java -jar" -->
-        <start-class>com.baeldung.changeport.CustomApplication</start-class>
-    </properties>
-
     <profiles>
         <profile>
             <id>errorhandling</id>
@@ -77,7 +72,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>1.5.2.RELEASE</version>
+                <version>${spring-boot-maven-plugin.version}</version>
                 <configuration>
                     <mainClass>${spring.boot.mainclass}</mainClass>
                 </configuration>
@@ -85,4 +80,11 @@
         </plugins>
     </build>
 
+    <properties>
+        <spring-boot-maven-plugin.version>1.5.2.RELEASE</spring-boot-maven-plugin.version>
+        <!-- The main class to start by executing "java -jar" -->
+        <start-class>com.baeldung.changeport.CustomApplication</start-class>
+    </properties>
+
+
 </project>
\ No newline at end of file