From 3fe2a1ab3ffd870365bbb56d4a797feb97add6d5 Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Tue, 6 Jun 2023 08:33:29 +0300
Subject: [PATCH] [JAVA-21772] Clean up (#14178)

---
 server-modules/undertow/pom.xml | 1 -
 server-modules/wildfly/pom.xml  | 5 -----
 spf4j/pom.xml                   | 5 +++++
 spf4j/spf4j-aspects-app/pom.xml | 8 +-------
 spf4j/spf4j-core-app/pom.xml    | 8 +-------
 spring-actuator/pom.xml         | 4 ++--
 spring-aop-2/pom.xml            | 2 --
 spring-aop/pom.xml              | 2 --
 8 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/server-modules/undertow/pom.xml b/server-modules/undertow/pom.xml
index 7d446c29d2..42a46d9508 100644
--- a/server-modules/undertow/pom.xml
+++ b/server-modules/undertow/pom.xml
@@ -32,7 +32,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>${maven-jar-plugin.version}</version>
                 <configuration>
                     <archive>
                         <manifest>
diff --git a/server-modules/wildfly/pom.xml b/server-modules/wildfly/pom.xml
index af742c7bd3..fece3c9866 100644
--- a/server-modules/wildfly/pom.xml
+++ b/server-modules/wildfly/pom.xml
@@ -63,7 +63,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>${maven-war-plugin.version}</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
@@ -75,8 +74,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
-    </properties>
-
 </project>
\ No newline at end of file
diff --git a/spf4j/pom.xml b/spf4j/pom.xml
index 6d325947cf..9d747f11dc 100644
--- a/spf4j/pom.xml
+++ b/spf4j/pom.xml
@@ -19,4 +19,9 @@
         <module>spf4j-aspects-app</module>
     </modules>
 
+    <properties>
+        <avro.version>1.10.2</avro.version>
+        <spf4j.version>8.9.0</spf4j.version>
+        <dependency.plugin.version>3.1.1</dependency.plugin.version>
+    </properties>
 </project>
\ No newline at end of file
diff --git a/spf4j/spf4j-aspects-app/pom.xml b/spf4j/spf4j-aspects-app/pom.xml
index 3eccdd879a..9769ff77f3 100644
--- a/spf4j/spf4j-aspects-app/pom.xml
+++ b/spf4j/spf4j-aspects-app/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.apache.avro</groupId>
             <artifactId>avro</artifactId>
-            <version>1.10.2</version>
+            <version>${avro.version}</version>
         </dependency>
     </dependencies>
 
@@ -59,7 +59,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>${dependency.plugin.version}</version>
                 <executions>
                     <execution>
                         <id>copy-dependencies</id>
@@ -91,9 +90,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <spf4j.version>8.9.0</spf4j.version>
-        <dependency.plugin.version>3.1.1</dependency.plugin.version>
-    </properties>
-
 </project>
\ No newline at end of file
diff --git a/spf4j/spf4j-core-app/pom.xml b/spf4j/spf4j-core-app/pom.xml
index 20251860aa..ee82ea869a 100644
--- a/spf4j/spf4j-core-app/pom.xml
+++ b/spf4j/spf4j-core-app/pom.xml
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>org.apache.avro</groupId>
             <artifactId>avro</artifactId>
-            <version>1.10.2</version>
+            <version>${avro.version}</version>
         </dependency>
     </dependencies>
 
@@ -65,7 +65,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>${dependency.plugin.version}</version>
                 <executions>
                     <execution>
                         <id>copy-dependencies</id>
@@ -97,9 +96,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <spf4j.version>8.9.0</spf4j.version>
-        <dependency.plugin.version>3.1.1</dependency.plugin.version>
-    </properties>
-
 </project>
\ No newline at end of file
diff --git a/spring-actuator/pom.xml b/spring-actuator/pom.xml
index 48dae45940..20b80d9924 100644
--- a/spring-actuator/pom.xml
+++ b/spring-actuator/pom.xml
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
-            <version>5.0.0</version>
+            <version>${jakarta.servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -49,7 +49,6 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
-                    <version>3.3.2</version>
                 </plugin>
                 <!-- to run the server, use mvn jetty:run -->
                 <plugin>
@@ -68,6 +67,7 @@
     </build>
 
     <properties>
+        <jakarta.servlet-api.version>5.0.0</jakarta.servlet-api.version>
         <spring-boot.version>3.0.6</spring-boot.version>
         <jetty.version>11.0.15</jetty.version>
     </properties>
diff --git a/spring-aop-2/pom.xml b/spring-aop-2/pom.xml
index cb84ed4ca2..e4748cdcbf 100644
--- a/spring-aop-2/pom.xml
+++ b/spring-aop-2/pom.xml
@@ -44,7 +44,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>${maven-war-plugin.version}</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
@@ -54,7 +53,6 @@
 
     <properties>
         <aspectj-plugin.version>1.14.0</aspectj-plugin.version>
-        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-aop/pom.xml b/spring-aop/pom.xml
index ae5ab5fce1..2b84e2a432 100644
--- a/spring-aop/pom.xml
+++ b/spring-aop/pom.xml
@@ -72,7 +72,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>${maven-war-plugin.version}</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
@@ -82,7 +81,6 @@
 
     <properties>
         <aspectj-plugin.version>1.14.0</aspectj-plugin.version>
-        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file