From 58b6560a6b8460219a88ccd9b31dd4f040a3eb38 Mon Sep 17 00:00:00 2001
From: anuragkumawat <anuragkumawat7@gmail.com>
Date: Fri, 9 Sep 2022 23:41:18 +0530
Subject: [PATCH]  JAVA-14445 POM Properties Cleanup - Week 28 - 2022 (#12691)

---
 apache-kafka-2/pom.xml                               | 3 ++-
 apache-spark/pom.xml                                 | 3 ++-
 core-groovy-modules/core-groovy-2/gmavenplus-pom.xml | 4 ----
 core-groovy-modules/core-groovy-2/pom.xml            | 3 ---
 core-groovy-modules/core-groovy-collections/pom.xml  | 9 ---------
 core-groovy-modules/core-groovy-strings/pom.xml      | 9 ---------
 core-groovy-modules/core-groovy/pom.xml              | 9 ---------
 core-groovy-modules/pom.xml                          | 9 +++++++++
 8 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/apache-kafka-2/pom.xml b/apache-kafka-2/pom.xml
index 45a3620598..067dedef8a 100644
--- a/apache-kafka-2/pom.xml
+++ b/apache-kafka-2/pom.xml
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna</artifactId>
-            <version>5.7.0</version>
+            <version>${jna.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -60,6 +60,7 @@
     </dependencies>
 
     <properties>
+        <jna.version>5.7.0</jna.version>
         <kafka.version>2.8.0</kafka.version>
         <testcontainers-kafka.version>1.15.3</testcontainers-kafka.version>
         <testcontainers-jupiter.version>1.15.3</testcontainers-jupiter.version>
diff --git a/apache-spark/pom.xml b/apache-spark/pom.xml
index b86e99433a..9e61e1340d 100644
--- a/apache-spark/pom.xml
+++ b/apache-spark/pom.xml
@@ -72,7 +72,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>${maven-assembly-plugin.version}</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -107,6 +107,7 @@
         <org.apache.spark.spark-streaming-kafka.version>2.4.8</org.apache.spark.spark-streaming-kafka.version>
         <com.datastax.spark.spark-cassandra-connector.version>2.5.2</com.datastax.spark.spark-cassandra-connector.version>
         <com.datastax.spark.spark-cassandra-connector-java.version>1.6.0-M1</com.datastax.spark.spark-cassandra-connector-java.version>
+        <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
         <postgres.version>42.3.3</postgres.version>
     </properties>
 
diff --git a/core-groovy-modules/core-groovy-2/gmavenplus-pom.xml b/core-groovy-modules/core-groovy-2/gmavenplus-pom.xml
index 43f089ac93..9d2711a9d0 100644
--- a/core-groovy-modules/core-groovy-2/gmavenplus-pom.xml
+++ b/core-groovy-modules/core-groovy-2/gmavenplus-pom.xml
@@ -165,13 +165,9 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <hsqldb.version>2.4.0</hsqldb.version>
-        <spock-core.version>1.1-groovy-2.4</spock-core.version>
         <commons-lang3.version>3.9</commons-lang3.version>
         <java.version>1.8</java.version>
         <logback.version>1.2.3</logback.version>
-        <groovy.version>2.5.7</groovy.version>
-        <gmavenplus-plugin.version>1.6</gmavenplus-plugin.version>
     </properties>
 </project>
 
diff --git a/core-groovy-modules/core-groovy-2/pom.xml b/core-groovy-modules/core-groovy-2/pom.xml
index cf4951b838..9835cb8baf 100644
--- a/core-groovy-modules/core-groovy-2/pom.xml
+++ b/core-groovy-modules/core-groovy-2/pom.xml
@@ -162,10 +162,7 @@
     </repositories>
 
     <properties>
-        <hsqldb.version>2.4.0</hsqldb.version>
-        <spock-core.version>1.1-groovy-2.4</spock-core.version>
         <groovy-wslite.version>1.1.3</groovy-wslite.version>
-        <groovy.version>2.5.7</groovy.version>
         <assembly.plugin.version>3.1.0</assembly.plugin.version>
         <compiler.plugin.version>3.8.0</compiler.plugin.version>
         <groovy.compiler.version>3.3.0-01</groovy.compiler.version>
diff --git a/core-groovy-modules/core-groovy-collections/pom.xml b/core-groovy-modules/core-groovy-collections/pom.xml
index 74cde808f5..5269121140 100644
--- a/core-groovy-modules/core-groovy-collections/pom.xml
+++ b/core-groovy-modules/core-groovy-collections/pom.xml
@@ -118,13 +118,4 @@
         </repository>
     </repositories>
 
-    <properties>
-        <groovy.version>2.5.6</groovy.version>
-        <groovy-all.version>2.5.6</groovy-all.version>
-        <groovy-sql.version>2.5.6</groovy-sql.version>
-        <hsqldb.version>2.4.0</hsqldb.version>
-        <spock-core.version>1.1-groovy-2.4</spock-core.version>
-        <gmavenplus-plugin.version>1.6</gmavenplus-plugin.version>
-    </properties>
-
 </project>
\ No newline at end of file
diff --git a/core-groovy-modules/core-groovy-strings/pom.xml b/core-groovy-modules/core-groovy-strings/pom.xml
index f6ad4d33cf..e51ebfbd4b 100644
--- a/core-groovy-modules/core-groovy-strings/pom.xml
+++ b/core-groovy-modules/core-groovy-strings/pom.xml
@@ -108,13 +108,4 @@
         </repository>
     </repositories>
 
-    <properties>
-        <groovy.version>2.5.6</groovy.version>
-        <groovy-all.version>2.5.6</groovy-all.version>
-        <groovy-sql.version>2.5.6</groovy-sql.version>
-        <hsqldb.version>2.4.0</hsqldb.version>
-        <spock-core.version>1.1-groovy-2.4</spock-core.version>
-        <gmavenplus-plugin.version>1.6</gmavenplus-plugin.version>
-    </properties>
-
 </project>
\ No newline at end of file
diff --git a/core-groovy-modules/core-groovy/pom.xml b/core-groovy-modules/core-groovy/pom.xml
index 0365a0d565..413fbde106 100644
--- a/core-groovy-modules/core-groovy/pom.xml
+++ b/core-groovy-modules/core-groovy/pom.xml
@@ -108,13 +108,4 @@
         </repository>
     </repositories>
 
-    <properties>
-        <groovy.version>2.5.6</groovy.version>
-        <groovy-all.version>2.5.6</groovy-all.version>
-        <groovy-sql.version>2.5.6</groovy-sql.version>
-        <hsqldb.version>2.4.0</hsqldb.version>
-        <spock-core.version>1.1-groovy-2.4</spock-core.version>
-        <gmavenplus-plugin.version>1.6</gmavenplus-plugin.version>
-    </properties>
-
 </project>
\ No newline at end of file
diff --git a/core-groovy-modules/pom.xml b/core-groovy-modules/pom.xml
index ccbd5cdcb5..e1ff538942 100644
--- a/core-groovy-modules/pom.xml
+++ b/core-groovy-modules/pom.xml
@@ -20,4 +20,13 @@
         <module>core-groovy-strings</module>
     </modules>
 
+    <properties>
+        <groovy.version>2.5.7</groovy.version>
+        <groovy-all.version>2.5.6</groovy-all.version>
+        <groovy-sql.version>2.5.6</groovy-sql.version>
+        <hsqldb.version>2.4.0</hsqldb.version>
+        <spock-core.version>1.1-groovy-2.4</spock-core.version>
+        <gmavenplus-plugin.version>1.6</gmavenplus-plugin.version>
+    </properties>
+
 </project>
\ No newline at end of file