From 8e7dc50c0e4ba9df54189f2be798134ff961ee42 Mon Sep 17 00:00:00 2001
From: kwoyke <krzysztofwoyke@gmail.com>
Date: Sun, 15 May 2022 08:53:05 +0200
Subject: [PATCH] Java 11788 (#12204)

* JAVA-11788: Cleanup pom properties in core-java-modules

* JAVA-11788: Cleanup pom properties
---
 core-java-modules/core-java-collections-4/pom.xml    |  6 +++++-
 core-java-modules/core-java/pom.xml                  |  3 ++-
 .../java-collections-conversions-2/pom.xml           |  6 +++++-
 core-java-modules/java-collections-maps-3/pom.xml    |  2 +-
 docker/docker-caching/multi-module-caching/pom.xml   |  3 ++-
 docker/docker-caching/single-module-caching/pom.xml  |  3 ++-
 grpc/pom.xml                                         |  3 ++-
 json-2/pom.xml                                       | 12 ++++++++----
 kubernetes/k8s-intro/pom.xml                         |  6 +++++-
 9 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/core-java-modules/core-java-collections-4/pom.xml b/core-java-modules/core-java-collections-4/pom.xml
index 68d7df66d0..aaf63a2b2a 100644
--- a/core-java-modules/core-java-collections-4/pom.xml
+++ b/core-java-modules/core-java-collections-4/pom.xml
@@ -18,8 +18,12 @@
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-            <version>2.2</version>
+            <version>${commons-lang.version}</version>
         </dependency>
     </dependencies>
 
+    <properties>
+        <commons-lang.version>2.2</commons-lang.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java/pom.xml b/core-java-modules/core-java/pom.xml
index 786ee91192..87abe6c007 100644
--- a/core-java-modules/core-java/pom.xml
+++ b/core-java-modules/core-java/pom.xml
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>com.google.gdata</groupId>
             <artifactId>core</artifactId>
-            <version>1.47.1</version>
+            <version>${gdata.version}</version>
         </dependency>
     </dependencies>
 
@@ -193,6 +193,7 @@
         <source.version>1.8</source.version>
         <target.version>1.8</target.version>
         <spring.core.version>4.3.20.RELEASE</spring.core.version>
+        <gdata.version>1.47.1</gdata.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/core-java-modules/java-collections-conversions-2/pom.xml b/core-java-modules/java-collections-conversions-2/pom.xml
index 0f8e80fdbf..510921c35e 100644
--- a/core-java-modules/java-collections-conversions-2/pom.xml
+++ b/core-java-modules/java-collections-conversions-2/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>io.vavr</groupId>
             <artifactId>vavr</artifactId>
-            <version>0.10.3</version>
+            <version>${vavr.version}</version>
         </dependency>
     </dependencies>
 
@@ -42,4 +42,8 @@
         </resources>
     </build>
 
+    <properties>
+        <vavr.version>0.10.3</vavr.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/core-java-modules/java-collections-maps-3/pom.xml b/core-java-modules/java-collections-maps-3/pom.xml
index db56550d10..ab80a9e2fd 100644
--- a/core-java-modules/java-collections-maps-3/pom.xml
+++ b/core-java-modules/java-collections-maps-3/pom.xml
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.1</version>
+            <version>${junit-jupiter.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/docker/docker-caching/multi-module-caching/pom.xml b/docker/docker-caching/multi-module-caching/pom.xml
index e02ced2dca..7e279dc334 100644
--- a/docker/docker-caching/multi-module-caching/pom.xml
+++ b/docker/docker-caching/multi-module-caching/pom.xml
@@ -19,13 +19,14 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>31.0.1-jre</version>
+                <version>${guava.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
 
     <properties>
         <java.version>1.8</java.version>
+        <guava.version>31.0.1-jre</guava.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/docker/docker-caching/single-module-caching/pom.xml b/docker/docker-caching/single-module-caching/pom.xml
index 74bb477fb2..d7f96e1e7e 100644
--- a/docker/docker-caching/single-module-caching/pom.xml
+++ b/docker/docker-caching/single-module-caching/pom.xml
@@ -11,7 +11,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.0.1-jre</version>
+            <version>${guava.version}</version>
         </dependency>
     </dependencies>
 
@@ -48,6 +48,7 @@
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
+        <guava.version>31.0.1-jre</guava.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/grpc/pom.xml b/grpc/pom.xml
index 40284c90fe..40d35183dc 100644
--- a/grpc/pom.xml
+++ b/grpc/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
-            <version>1.2</version>
+            <version>${annotation-api.version}</version>
         </dependency>
     </dependencies>
 
@@ -79,6 +79,7 @@
         <protoc.version>3.17.2</protoc.version>
         <os-maven-plugin.version>1.6.2</os-maven-plugin.version>
         <protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
+        <annotation-api.version>1.2</annotation-api.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/json-2/pom.xml b/json-2/pom.xml
index 3e12fccc29..6fbdebc953 100644
--- a/json-2/pom.xml
+++ b/json-2/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.jsonschema2pojo</groupId>
             <artifactId>jsonschema2pojo-core</artifactId>
-            <version>1.1.1</version>
+            <version>${jsonschema2pojo-core.version}</version>
         </dependency>
         <dependency>
             <groupId>com.jsoniter</groupId>
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>com.io-informatics.oss</groupId>
             <artifactId>jackson-jsonld</artifactId>
-            <version>0.1.1</version>
+            <version>${jackson-jsonld.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>jackson-databind</artifactId>
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>de.escalon.hypermedia</groupId>
             <artifactId>hydra-jsonld</artifactId>
-            <version>0.4.2</version>
+            <version>${hydra-jsonld.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>jackson-databind</artifactId>
@@ -96,7 +96,7 @@
         <dependency>
             <groupId>com.github.jsonld-java</groupId>
             <artifactId>jsonld-java</artifactId>
-            <version>0.13.0</version>
+            <version>${jsonld-java.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>jackson-core</artifactId>
@@ -154,6 +154,10 @@
         <moshi.version>1.9.2</moshi.version>
         <fastjson.version>1.2.21</fastjson.version>
         <json.version>20211205</json.version>
+        <jsonschema2pojo-core.version>1.1.1</jsonschema2pojo-core.version>
+        <jackson-jsonld.version>0.1.1</jackson-jsonld.version>
+        <hydra-jsonld.version>0.4.2</hydra-jsonld.version>
+        <jsonld-java.version>0.13.0</jsonld-java.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/kubernetes/k8s-intro/pom.xml b/kubernetes/k8s-intro/pom.xml
index 6d1cec9971..067700bdad 100644
--- a/kubernetes/k8s-intro/pom.xml
+++ b/kubernetes/k8s-intro/pom.xml
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>io.kubernetes</groupId>
             <artifactId>client-java</artifactId>
-            <version>11.0.0</version>
+            <version>${client-java.version}</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -39,4 +39,8 @@
         </plugins>
     </build>
 
+    <properties>
+        <client-java.version>11.0.0</client-java.version>
+    </properties>
+
 </project>
\ No newline at end of file