From 34fec650c0f17851bc219345c8840bd3c5ef5cd1 Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Fri, 15 Mar 2024 10:03:12 +0200
Subject: [PATCH] [JAVA-32166] Clean up (#16091)

---
 apache-libraries-2/README.md                  |  2 ++
 apache-libraries/README.md                    |  2 ++
 apache-velocity/pom.xml                       |  4 ++--
 .../runner-module/pom.xml                     |  3 ++-
 .../single-module-caching/pom.xml             |  3 ++-
 drools/pom.xml                                | 24 +++++++++----------
 web-modules/javax-servlets-2/pom.xml          |  4 ++--
 web-modules/javax-servlets/pom.xml            |  4 ++--
 web-modules/jooby/pom.xml                     |  7 +++---
 web-modules/ratpack/pom.xml                   |  4 ++--
 web-modules/resteasy/pom.xml                  |  2 +-
 web-modules/spark-java/pom.xml                |  5 ++--
 12 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/apache-libraries-2/README.md b/apache-libraries-2/README.md
index c80677a4bc..0933653be0 100644
--- a/apache-libraries-2/README.md
+++ b/apache-libraries-2/README.md
@@ -1,3 +1,5 @@
 ## Relevant Articles
 - [Understanding XSLT Processing in Java](https://www.baeldung.com/java-extensible-stylesheet-language-transformations)
 - [Add Camel Route at Runtime in Java](https://www.baeldung.com/java-camel-dynamic-route)
+
+- More articles: [[<-- prev]](../apache-libraries)
diff --git a/apache-libraries/README.md b/apache-libraries/README.md
index 6fe09008dc..410c0a2b36 100644
--- a/apache-libraries/README.md
+++ b/apache-libraries/README.md
@@ -13,3 +13,5 @@ This module contains articles about various Apache libraries and utilities
 - [Introduction to Apache Curator](https://www.baeldung.com/apache-curator)
 - [A Quick Guide to Apache Geode](https://www.baeldung.com/apache-geode)
 - [Guide To Solr in Java With Apache SolrJ](https://www.baeldung.com/apache-solrj)
+
+- More articles: [[next -->]](../apache-libraries-2)
\ No newline at end of file
diff --git a/apache-velocity/pom.xml b/apache-velocity/pom.xml
index f4b6de8872..4718ad2f62 100644
--- a/apache-velocity/pom.xml
+++ b/apache-velocity/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>${org.apache.httpcomponents.version}</version>
+            <version>${httpclient.version}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -60,7 +60,7 @@
     </build>
 
     <properties>
-        <org.apache.httpcomponents.version>4.5.2</org.apache.httpcomponents.version>
+        <httpclient.version>4.5.2</httpclient.version>
         <velocity-version>1.7</velocity-version>
         <velocity-tools-version>2.0</velocity-tools-version>
     </properties>
diff --git a/docker-modules/docker-caching/multi-module-caching/runner-module/pom.xml b/docker-modules/docker-caching/multi-module-caching/runner-module/pom.xml
index e608706864..8d6bba9183 100644
--- a/docker-modules/docker-caching/multi-module-caching/runner-module/pom.xml
+++ b/docker-modules/docker-caching/multi-module-caching/runner-module/pom.xml
@@ -24,7 +24,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>${maven-assembly-plugin.version}</version>
                 <configuration>
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
@@ -50,6 +50,7 @@
     </build>
 
     <properties>
+        <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
     </properties>
diff --git a/docker-modules/docker-caching/single-module-caching/pom.xml b/docker-modules/docker-caching/single-module-caching/pom.xml
index 1e90c7130e..3360360742 100644
--- a/docker-modules/docker-caching/single-module-caching/pom.xml
+++ b/docker-modules/docker-caching/single-module-caching/pom.xml
@@ -20,7 +20,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>${maven-assembly-plugin.version}</version>
                 <configuration>
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
@@ -50,6 +50,7 @@
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <guava.version>33.0.0-jre</guava.version>
+        <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/drools/pom.xml b/drools/pom.xml
index 12aaf1318a..cb4f20d397 100644
--- a/drools/pom.xml
+++ b/drools/pom.xml
@@ -16,50 +16,50 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
-            <version>${http-component-version}</version>
+            <version>${httpcore.version}</version>
         </dependency>
         <dependency>
             <groupId>org.kie</groupId>
             <artifactId>kie-ci</artifactId>
-            <version>${drools-version}</version>
+            <version>${drools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.drools</groupId>
             <artifactId>drools-decisiontables</artifactId>
-            <version>${drools-version}</version>
+            <version>${drools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.drools</groupId>
             <artifactId>drools-core</artifactId>
-            <version>${drools-version}</version>
+            <version>${drools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.drools</groupId>
             <artifactId>drools-compiler</artifactId>
-            <version>${drools-version}</version>
+            <version>${drools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>${apache-poi-version}</version>
+            <version>${poi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>${apache-poi-version}</version>
+            <version>${poi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.optaplanner</groupId>
             <artifactId>optaplanner-core</artifactId>
-            <version>${opta-planner-version}</version>
+            <version>${optaplanner-core.version}</version>
         </dependency>
     </dependencies>
 
     <properties>
-        <http-component-version>4.4.16</http-component-version>
-        <drools-version>8.32.0.Final</drools-version>
-        <apache-poi-version>5.2.3</apache-poi-version>
-        <opta-planner-version>8.32.0.Final</opta-planner-version>
+        <httpcore.version>4.4.16</httpcore.version>
+        <drools.version>8.32.0.Final</drools.version>
+        <poi.version>5.2.3</poi.version>
+        <optaplanner-core.version>8.32.0.Final</optaplanner-core.version>
     </properties>
 
 </project>
diff --git a/web-modules/javax-servlets-2/pom.xml b/web-modules/javax-servlets-2/pom.xml
index a6bfc6b473..a792f6eea2 100644
--- a/web-modules/javax-servlets-2/pom.xml
+++ b/web-modules/javax-servlets-2/pom.xml
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>${org.apache.httpcomponents.version}</version>
+            <version>${httpclient.version}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -106,7 +106,7 @@
     </build>
 
     <properties>
-        <org.apache.httpcomponents.version>4.5.13</org.apache.httpcomponents.version>
+        <httpclient.version>4.5.13</httpclient.version>
         <jmockit.version>1.49</jmockit.version>
         <spring-test.version>5.3.20</spring-test.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
diff --git a/web-modules/javax-servlets/pom.xml b/web-modules/javax-servlets/pom.xml
index 406cfc05c1..ba585d36f6 100644
--- a/web-modules/javax-servlets/pom.xml
+++ b/web-modules/javax-servlets/pom.xml
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>${org.apache.httpcomponents.version}</version>
+            <version>${httpclient.version}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -48,7 +48,7 @@
     </dependencies>
 
     <properties>
-        <org.apache.httpcomponents.version>4.5.3</org.apache.httpcomponents.version>
+        <httpclient.version>4.5.3</httpclient.version>
         <gson.version>2.10.1</gson.version>
     </properties>
 
diff --git a/web-modules/jooby/pom.xml b/web-modules/jooby/pom.xml
index c298ea8729..0c4cb56c58 100644
--- a/web-modules/jooby/pom.xml
+++ b/web-modules/jooby/pom.xml
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>${squareup.okhttp.version}</version>
+            <version>${okhttp.version}</version>
         </dependency>
     </dependencies>
 
@@ -61,7 +61,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler.version}</version>
+                <version>${maven-compiler-plugin.version}</version>
                 <configuration>
                     <compilerArgs>
                         <arg>-parameters</arg>
@@ -76,8 +76,7 @@
         <rest-assured.version>3.1.1</rest-assured.version>
         <application.class>com.baeldung.jooby.App</application.class>
         <maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
-        <squareup.okhttp.version>5.0.0-alpha.12</squareup.okhttp.version>
-        <maven-compiler.version>3.12.1</maven-compiler.version>
+        <okhttp.version>5.0.0-alpha.12</okhttp.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/web-modules/ratpack/pom.xml b/web-modules/ratpack/pom.xml
index 1ef358cc55..3f93f25bef 100644
--- a/web-modules/ratpack/pom.xml
+++ b/web-modules/ratpack/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-sql</artifactId>
-            <version>${groovy.sql.version}</version>
+            <version>${groovy-sql.version}</version>
         </dependency>
         <dependency>
             <groupId>io.ratpack</groupId>
@@ -104,7 +104,7 @@
         <httpclient.version>4.5.3</httpclient.version>
         <httpcore.version>4.4.6</httpcore.version>
         <hystrix.version>1.5.12</hystrix.version>
-        <groovy.sql.version>2.4.15</groovy.sql.version>
+        <groovy-sql.version>2.4.15</groovy-sql.version>
         <ratpack.test.latest.version>1.6.1</ratpack.test.latest.version>
     </properties>
 
diff --git a/web-modules/resteasy/pom.xml b/web-modules/resteasy/pom.xml
index 355dcdb9b5..edc75fe4c7 100644
--- a/web-modules/resteasy/pom.xml
+++ b/web-modules/resteasy/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>4.0.1</version>
+            <version>${javax.servlet-api.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/web-modules/spark-java/pom.xml b/web-modules/spark-java/pom.xml
index e49be68319..22bbac92bc 100644
--- a/web-modules/spark-java/pom.xml
+++ b/web-modules/spark-java/pom.xml
@@ -20,17 +20,16 @@
             <artifactId>spark-core</artifactId>
             <version>${sparkjava.spark-core.version}</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>${google.code.gson.version}</version>
+            <version>${gson.version}</version>
         </dependency>
     </dependencies>
 
     <properties>
         <sparkjava.spark-core.version>2.5.4</sparkjava.spark-core.version>
-        <google.code.gson.version>2.10.1</google.code.gson.version>
+        <gson.version>2.10.1</gson.version>
     </properties>
 
 </project>
\ No newline at end of file