From 51b15d43700584b7060607400e26e9ff8955ffbb Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztof.woyke.sp@lhsystems.com>
Date: Wed, 24 Mar 2021 09:19:46 +0100
Subject: [PATCH 1/7] JAVA-3295: Fix main pom.xml formatting

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f202430ccf..c016f0abbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1351,7 +1351,7 @@
         <gib.buildUpstream>false</gib.buildUpstream>
         <gib.failOnMissingGitDir>false</gib.failOnMissingGitDir>
         <gib.failOnError>false</gib.failOnError>        
-	<gib.disable>true</gib.disable>
+        <gib.disable>true</gib.disable>
 
         <junit.version>4.12</junit.version>
         <hamcrest.version>2.2</hamcrest.version>

From df93a6b9e616501f2500ff3b94061ffaf0be3736 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztof.woyke.sp@lhsystems.com>
Date: Wed, 24 Mar 2021 09:37:43 +0100
Subject: [PATCH 2/7] JAVA-3295: Use project.build.sourceEncoding and
 project.reporting.outputEncoding from the main pom.xml

---
 akka-http/pom.xml                                            | 2 --
 core-java-modules/core-java-streams-2/pom.xml                | 1 -
 core-java-modules/multimodulemavenproject/pom.xml            | 1 -
 custom-pmd/pom.xml                                           | 1 -
 ddd-modules/pom.xml                                          | 2 --
 google-web-toolkit/pom.xml                                   | 3 ---
 jhipster-5/bookstore-monolith/pom.xml                        | 2 --
 jhipster/jhipster-uaa/gateway/pom.xml                        | 2 --
 jhipster/jhipster-uaa/quotes/pom.xml                         | 2 --
 jhipster/jhipster-uaa/uaa/pom.xml                            | 2 --
 persistence-modules/sirix/pom.xml                            | 1 -
 .../greeter-spring-boot-autoconfigure/pom.xml                | 1 -
 .../greeter-spring-boot-starter/pom.xml                      | 1 -
 .../kubernetes-selfhealing/liveness-example/pom.xml          | 5 -----
 .../kubernetes-selfhealing/readiness-example/pom.xml         | 5 -----
 .../spring-cloud-zuul-eureka-integration/bin/pom.xml         | 1 -
 .../spring-security-web-angular/server/pom.xml               | 5 -----
 testing-modules/zerocode/pom.xml                             | 1 -
 18 files changed, 38 deletions(-)

diff --git a/akka-http/pom.xml b/akka-http/pom.xml
index c0b460dd8e..c146e58b60 100644
--- a/akka-http/pom.xml
+++ b/akka-http/pom.xml
@@ -38,8 +38,6 @@
     </dependencies>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <akka.http.version>10.0.11</akka.http.version>
         <akka.stream.version>2.5.11</akka.stream.version>
     </properties>
diff --git a/core-java-modules/core-java-streams-2/pom.xml b/core-java-modules/core-java-streams-2/pom.xml
index 2a0a4348b0..323e01261f 100644
--- a/core-java-modules/core-java-streams-2/pom.xml
+++ b/core-java-modules/core-java-streams-2/pom.xml
@@ -47,7 +47,6 @@
     </dependencies>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.9</maven.compiler.source>
         <maven.compiler.target>1.9</maven.compiler.target>
         <assertj.version>3.11.1</assertj.version>
diff --git a/core-java-modules/multimodulemavenproject/pom.xml b/core-java-modules/multimodulemavenproject/pom.xml
index dcf9f7311e..25f268f8b3 100644
--- a/core-java-modules/multimodulemavenproject/pom.xml
+++ b/core-java-modules/multimodulemavenproject/pom.xml
@@ -59,7 +59,6 @@
         <compiler.plugin.version>3.8.0</compiler.plugin.version>
         <source.version>1.9</source.version>
         <target.version>1.9</target.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <assertj-core.version>3.12.2</assertj-core.version>
     </properties>
 
diff --git a/custom-pmd/pom.xml b/custom-pmd/pom.xml
index e0f38199ec..50bd16e2d5 100644
--- a/custom-pmd/pom.xml
+++ b/custom-pmd/pom.xml
@@ -45,7 +45,6 @@
     </build>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
         <pmdVersion>6.0.1</pmdVersion>
         <maven.compiler.source>1.8</maven.compiler.source>
diff --git a/ddd-modules/pom.xml b/ddd-modules/pom.xml
index 6ab1829198..4072d93f90 100644
--- a/ddd-modules/pom.xml
+++ b/ddd-modules/pom.xml
@@ -75,8 +75,6 @@
     </build>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
         <source.version>9</source.version>
         <target.version>9</target.version>
 
diff --git a/google-web-toolkit/pom.xml b/google-web-toolkit/pom.xml
index 6fdcae4f75..cad15c8037 100644
--- a/google-web-toolkit/pom.xml
+++ b/google-web-toolkit/pom.xml
@@ -113,9 +113,6 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
 
-        <!-- Don't let your Mac use a crazy non-standard encoding -->
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <gwt.version>2.8.2</gwt.version>
         <gwt.plugin.version>1.0-rc-8</gwt.plugin.version>
         <surefire.plugin.version>2.17</surefire.plugin.version>
diff --git a/jhipster-5/bookstore-monolith/pom.xml b/jhipster-5/bookstore-monolith/pom.xml
index dbc46bbb97..5da3bde449 100644
--- a/jhipster-5/bookstore-monolith/pom.xml
+++ b/jhipster-5/bookstore-monolith/pom.xml
@@ -1099,8 +1099,6 @@
         <scala.version>2.12.6</scala.version>
         <node.version>v10.15.0</node.version>
         <npm.version>6.4.1</npm.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
         <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
         <maven.compiler.source>${java.version}</maven.compiler.source>
diff --git a/jhipster/jhipster-uaa/gateway/pom.xml b/jhipster/jhipster-uaa/gateway/pom.xml
index b417bd7b57..21a04a9692 100644
--- a/jhipster/jhipster-uaa/gateway/pom.xml
+++ b/jhipster/jhipster-uaa/gateway/pom.xml
@@ -1020,8 +1020,6 @@
         <scala.version>2.12.6</scala.version>
         <node.version>v8.12.0</node.version>
         <npm.version>6.4.1</npm.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
         <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
         <maven.compiler.source>${java.version}</maven.compiler.source>
diff --git a/jhipster/jhipster-uaa/quotes/pom.xml b/jhipster/jhipster-uaa/quotes/pom.xml
index f088ad2fd1..12bbf66d37 100644
--- a/jhipster/jhipster-uaa/quotes/pom.xml
+++ b/jhipster/jhipster-uaa/quotes/pom.xml
@@ -840,8 +840,6 @@
         <scala.version>2.12.6</scala.version>
         <node.version>v8.12.0</node.version>
         <npm.version>6.4.1</npm.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
         <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
         <maven.compiler.source>${java.version}</maven.compiler.source>
diff --git a/jhipster/jhipster-uaa/uaa/pom.xml b/jhipster/jhipster-uaa/uaa/pom.xml
index f9c1f226bb..d0d81aa0b3 100644
--- a/jhipster/jhipster-uaa/uaa/pom.xml
+++ b/jhipster/jhipster-uaa/uaa/pom.xml
@@ -842,8 +842,6 @@
         <scala.version>2.12.6</scala.version>
         <node.version>v8.12.0</node.version>
         <npm.version>6.4.1</npm.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
         <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
         <maven.compiler.source>${java.version}</maven.compiler.source>
diff --git a/persistence-modules/sirix/pom.xml b/persistence-modules/sirix/pom.xml
index 67de507cca..da9695081c 100644
--- a/persistence-modules/sirix/pom.xml
+++ b/persistence-modules/sirix/pom.xml
@@ -47,7 +47,6 @@
     </build>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.release.version>11</maven.release.version>
         <sirix-core.version>0.9.3</sirix-core.version>
         <compiler.plugin.version>3.8.0</compiler.plugin.version>
diff --git a/spring-boot-modules/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/pom.xml b/spring-boot-modules/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/pom.xml
index 532f45cf3e..4903f21c77 100644
--- a/spring-boot-modules/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/pom.xml
+++ b/spring-boot-modules/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/pom.xml
@@ -62,7 +62,6 @@
     </build>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring-boot.version>2.2.6.RELEASE</spring-boot.version>
         <greeter.version>0.0.1-SNAPSHOT</greeter.version>
     </properties>
diff --git a/spring-boot-modules/spring-boot-custom-starter/greeter-spring-boot-starter/pom.xml b/spring-boot-modules/spring-boot-custom-starter/greeter-spring-boot-starter/pom.xml
index 0e8fb4cbc9..85a6721492 100644
--- a/spring-boot-modules/spring-boot-custom-starter/greeter-spring-boot-starter/pom.xml
+++ b/spring-boot-modules/spring-boot-custom-starter/greeter-spring-boot-starter/pom.xml
@@ -49,7 +49,6 @@
     </build>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <greeter.version>0.0.1-SNAPSHOT</greeter.version>
         <spring-boot.version>2.2.6.RELEASE</spring-boot.version>
     </properties>
diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml b/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml
index f0d34d2231..16e718a3be 100644
--- a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml
+++ b/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml
@@ -41,9 +41,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
 </project>
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml b/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml
index 8bfd4d305d..0ee40b6504 100644
--- a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml
+++ b/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml
@@ -41,9 +41,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
 </project>
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/pom.xml b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/pom.xml
index c7b35ef934..c6658d70a2 100644
--- a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/pom.xml
+++ b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/pom.xml
@@ -22,7 +22,6 @@
     </modules>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
         <spring-boot-maven-plugin.version>1.4.2.RELEASE</spring-boot-maven-plugin.version>
         <commons-config.version>1.10</commons-config.version>
diff --git a/spring-security-modules/spring-security-web-angular/server/pom.xml b/spring-security-modules/spring-security-web-angular/server/pom.xml
index 19d980062c..07d5d44e8d 100644
--- a/spring-security-modules/spring-security-web-angular/server/pom.xml
+++ b/spring-security-modules/spring-security-web-angular/server/pom.xml
@@ -62,9 +62,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
 </project>
diff --git a/testing-modules/zerocode/pom.xml b/testing-modules/zerocode/pom.xml
index 9d765e6cb4..dce62df9ea 100644
--- a/testing-modules/zerocode/pom.xml
+++ b/testing-modules/zerocode/pom.xml
@@ -92,7 +92,6 @@
     </build>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <spring.boot.version>2.4.2</spring.boot.version>

From 5e3e710e84e9687d1a3e05f20ef8eabd085888c2 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztof.woyke.sp@lhsystems.com>
Date: Wed, 24 Mar 2021 10:31:09 +0100
Subject: [PATCH 3/7] JAVA-3295: Fix pom properties in testing-modules

---
 .../math-test-functions/pom.xml                |  6 +++++-
 .../string-test-functions/pom.xml              |  6 +++++-
 testing-modules/testing-assertions/pom.xml     | 18 ++++++++++++------
 testing-modules/testing-libraries-2/pom.xml    |  3 ++-
 testing-modules/testing-libraries/pom.xml      |  4 ++--
 testing-modules/zerocode/pom.xml               |  9 ++++++---
 6 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/testing-modules/parallel-tests-junit/math-test-functions/pom.xml b/testing-modules/parallel-tests-junit/math-test-functions/pom.xml
index fb12803333..fdd45e19d6 100644
--- a/testing-modules/parallel-tests-junit/math-test-functions/pom.xml
+++ b/testing-modules/parallel-tests-junit/math-test-functions/pom.xml
@@ -27,7 +27,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.0</version>
+                <version>${maven-surefire-plugin.version}</version>
                 <configuration>
                     <parallel>all</parallel>
                     <threadCount>10</threadCount>
@@ -45,4 +45,8 @@
         </plugins>
     </build>
 
+    <properties>
+        <maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
+    </properties>
+
 </project>
diff --git a/testing-modules/parallel-tests-junit/string-test-functions/pom.xml b/testing-modules/parallel-tests-junit/string-test-functions/pom.xml
index 313d82c23f..727a1f814a 100644
--- a/testing-modules/parallel-tests-junit/string-test-functions/pom.xml
+++ b/testing-modules/parallel-tests-junit/string-test-functions/pom.xml
@@ -27,7 +27,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.0</version>
+                <version>${maven-surefire-plugin.version}</version>
                 <configuration>
                     <parallel>all</parallel>
                     <useUnlimitedThreads>true</useUnlimitedThreads>
@@ -37,4 +37,8 @@
         </plugins>
     </build>
 
+    <properties>
+        <maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
+    </properties>
+
 </project>
diff --git a/testing-modules/testing-assertions/pom.xml b/testing-modules/testing-assertions/pom.xml
index fa0f666c7f..4f0209a484 100644
--- a/testing-modules/testing-assertions/pom.xml
+++ b/testing-modules/testing-assertions/pom.xml
@@ -16,36 +16,36 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
+            <version>${logback.version}</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.6.2</version>
+            <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.6.2</version>
+            <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.16.1</version>
+            <version>${assertj-core.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-all</artifactId>
-            <version>1.3</version>
+            <version>${hamcrest-all.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
-            <version>4.4</version>
+            <version>${commons-collections4.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -59,4 +59,10 @@
             </plugin>
         </plugins>
     </build>
+
+    <properties>
+        <assertj-core.version>3.16.1</assertj-core.version>
+        <commons-collections4.version>4.4</commons-collections4.version>
+        <junit-jupiter.version>5.6.2</junit-jupiter.version>
+    </properties>
 </project>
diff --git a/testing-modules/testing-libraries-2/pom.xml b/testing-modules/testing-libraries-2/pom.xml
index 42c84d0da9..7f96280cac 100644
--- a/testing-modules/testing-libraries-2/pom.xml
+++ b/testing-modules/testing-libraries-2/pom.xml
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.16.1</version>
+            <version>${assertj-core.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -86,5 +86,6 @@
         <system-lambda.version>1.0.0</system-lambda.version>
         <system-stubs.version>1.1.0</system-stubs.version>
         <junit.jupiter.version>5.6.2</junit.jupiter.version>
+        <assertj-core.version>3.16.1</assertj-core.version>
     </properties>
 </project>
diff --git a/testing-modules/testing-libraries/pom.xml b/testing-modules/testing-libraries/pom.xml
index aa22a5253e..4edd13fa30 100644
--- a/testing-modules/testing-libraries/pom.xml
+++ b/testing-modules/testing-libraries/pom.xml
@@ -36,11 +36,10 @@
             <version>${cucumber.version}</version>
             <scope>test</scope>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>2.2.0.RELEASE</version>
+            <version>${spring-boot.version}</version>
         </dependency>
         <dependency>
             <groupId>com.github.stefanbirkner</groupId>
@@ -103,6 +102,7 @@
         <checkstyle-maven-plugin.version>3.0.0</checkstyle-maven-plugin.version>
         <system-rules.version>1.19.0</system-rules.version>
         <system-lambda.version>1.0.0</system-lambda.version>
+        <spring-boot.version>2.4.3</spring-boot.version>
     </properties>
 
 </project>
diff --git a/testing-modules/zerocode/pom.xml b/testing-modules/zerocode/pom.xml
index dce62df9ea..63f0dc9cbb 100644
--- a/testing-modules/zerocode/pom.xml
+++ b/testing-modules/zerocode/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>org.jsmart</groupId>
             <artifactId>zerocode-tdd</artifactId>
-            <version>1.3.27</version>
+            <version>${zerocode-tdd.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -68,7 +68,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.0.0-M5</version>
+                <version>${maven-failsafe-plugin.version}</version>
                 <configuration>
                     <skip>${skip.it}</skip>
                 </configuration>
@@ -76,7 +76,7 @@
                     <dependency>
                         <groupId>org.apache.maven.surefire</groupId>
                         <artifactId>surefire-junit47</artifactId>
-                        <version>3.0.0-M5</version>
+                        <version>${surefire-junit47.version}</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -92,10 +92,13 @@
     </build>
 
     <properties>
+        <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
+        <surefire-junit47.version>3.0.0-M5</surefire-junit47.version>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <spring.boot.version>2.4.2</spring.boot.version>
         <skip.it>true</skip.it>
+        <zerocode-tdd.version>1.3.27</zerocode-tdd.version>
     </properties>
 
 </project>

From 6ef0632df28968c89276ff266c6aba5b11e001ba Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztof.woyke.sp@lhsystems.com>
Date: Wed, 24 Mar 2021 12:32:33 +0100
Subject: [PATCH 4/7] JAVA-3295: Fix pom properties in persistence-modules

---
 persistence-modules/apache-bookkeeper/pom.xml    |  3 ++-
 persistence-modules/java-jpa-3/pom.xml           |  7 ++++---
 persistence-modules/jooq/pom.xml                 | 16 +++++++++++-----
 persistence-modules/spring-data-geode/pom.xml    |  3 ++-
 .../spring-data-jpa-enterprise/pom.xml           |  5 ++---
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/persistence-modules/apache-bookkeeper/pom.xml b/persistence-modules/apache-bookkeeper/pom.xml
index 32467b9997..3ef1f50d63 100644
--- a/persistence-modules/apache-bookkeeper/pom.xml
+++ b/persistence-modules/apache-bookkeeper/pom.xml
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>1.14.3</version>
+            <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -39,6 +39,7 @@
 
     <properties>
         <org.apache.bookkeeper.version>4.10.0</org.apache.bookkeeper.version>
+        <testcontainers.version>1.14.3</testcontainers.version>
     </properties>
 
 
diff --git a/persistence-modules/java-jpa-3/pom.xml b/persistence-modules/java-jpa-3/pom.xml
index 7c02cc6c8e..f931cd90b8 100644
--- a/persistence-modules/java-jpa-3/pom.xml
+++ b/persistence-modules/java-jpa-3/pom.xml
@@ -30,17 +30,17 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.21</version>
+            <version>${mysql.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.11.3</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-hibernate5</artifactId>
-            <version>2.9.8</version>
+            <version>${jackson.version}</version>
         </dependency>
         <!--Compile time JPA API -->
         <dependency>
@@ -87,6 +87,7 @@
         <hibernate.version>5.4.14.Final</hibernate.version>
         <eclipselink.version>2.7.4</eclipselink.version>
         <postgres.version>42.2.5</postgres.version>
+        <mysql.version>8.0.21</mysql.version>
         <javax.persistence-api.version>2.2</javax.persistence-api.version>
         <assertj.version>3.11.1</assertj.version>
         <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
diff --git a/persistence-modules/jooq/pom.xml b/persistence-modules/jooq/pom.xml
index f0c5a27a96..cdda860040 100644
--- a/persistence-modules/jooq/pom.xml
+++ b/persistence-modules/jooq/pom.xml
@@ -19,28 +19,34 @@
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq</artifactId>
-            <version>3.13.4</version>
+            <version>${jooq.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq-meta</artifactId>
-            <version>3.13.4</version>
+            <version>${jooq.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq-codegen</artifactId>
-            <version>3.13.4</version>
+            <version>${jooq.version}</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.2.16</version>
+            <version>${postgresql.version}</version>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.200</version>
+            <version>${h2.version}</version>
         </dependency>
     </dependencies>
 
+    <properties>
+        <jooq.version>3.13.4</jooq.version>
+        <postgresql.version>42.2.16</postgresql.version>
+        <h2.version>1.4.200</h2.version>
+    </properties>
+
 </project>
diff --git a/persistence-modules/spring-data-geode/pom.xml b/persistence-modules/spring-data-geode/pom.xml
index 07aa65463c..ebdb37299e 100644
--- a/persistence-modules/spring-data-geode/pom.xml
+++ b/persistence-modules/spring-data-geode/pom.xml
@@ -61,7 +61,7 @@
             <plugin>
                 <groupId>com.mysema.maven</groupId>
                 <artifactId>maven-apt-plugin</artifactId>
-                <version>1.0</version>
+                <version>${maven-apt-plugin.version}</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
@@ -88,6 +88,7 @@
         <start-class>com.baeldung.springdatageode.app.ClientCacheApp</start-class>
         <spring-geode-starter-version>1.1.1.RELEASE</spring-geode-starter-version>
         <spring.boot.starter.version>2.1.9.RELEASE</spring.boot.starter.version>
+        <maven-apt-plugin.version>1.0</maven-apt-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa-enterprise/pom.xml b/persistence-modules/spring-data-jpa-enterprise/pom.xml
index 7ff2f00fdf..12ffeee7f0 100644
--- a/persistence-modules/spring-data-jpa-enterprise/pom.xml
+++ b/persistence-modules/spring-data-jpa-enterprise/pom.xml
@@ -78,7 +78,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>${maven-compiler-plugin.version}</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -86,7 +86,7 @@
                         <path>
                             <groupId>org.mapstruct</groupId>
                             <artifactId>mapstruct-processor</artifactId>
-                            <version>1.3.1.Final</version>
+                            <version>${mapstruct.version}</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>
@@ -98,7 +98,6 @@
         <mapstruct.version>1.3.1.Final</mapstruct.version>
         <guava.version>21.0</guava.version>
         <testcontainers.version>1.12.2</testcontainers.version>
-
     </properties>
 
 </project>

From 7b6ba3184734c5962a0eec3d03600f335c73165a Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztof.woyke.sp@lhsystems.com>
Date: Thu, 25 Mar 2021 13:12:01 +0100
Subject: [PATCH 5/7] JAVA-3295: Fix pom properties in spring-boot-modules

---
 .../spring-boot-autoconfiguration/pom.xml              |  1 -
 spring-boot-modules/spring-boot-bootstrap/pom.xml      | 10 ++++++----
 spring-boot-modules/spring-boot-security/pom.xml       |  1 -
 spring-boot-modules/spring-boot-swagger-jwt/pom.xml    |  6 +++++-
 spring-boot-modules/spring-boot-swagger/pom.xml        |  6 +++++-
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/spring-boot-modules/spring-boot-autoconfiguration/pom.xml b/spring-boot-modules/spring-boot-autoconfiguration/pom.xml
index 269d87bbb9..4990e6884c 100644
--- a/spring-boot-modules/spring-boot-autoconfiguration/pom.xml
+++ b/spring-boot-modules/spring-boot-autoconfiguration/pom.xml
@@ -48,7 +48,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
-            <version>2.1.6.RELEASE</version>
             <optional>true</optional>
         </dependency>
 
diff --git a/spring-boot-modules/spring-boot-bootstrap/pom.xml b/spring-boot-modules/spring-boot-bootstrap/pom.xml
index 6a1be7a2c8..5f1cd8fb65 100644
--- a/spring-boot-modules/spring-boot-bootstrap/pom.xml
+++ b/spring-boot-modules/spring-boot-bootstrap/pom.xml
@@ -167,7 +167,7 @@
                     <dependency>
                         <groupId>org.springframework.cloud</groupId>
                         <artifactId>spring-cloud-dependencies</artifactId>
-                        <version>Greenwich.RELEASE</version>
+                        <version>${spring-cloud.version}</version>
                         <type>pom</type>
                         <scope>import</scope>
                     </dependency>
@@ -177,12 +177,12 @@
                 <dependency>
                     <groupId>org.springframework.cloud</groupId>
                     <artifactId>spring-cloud-gcp-starter</artifactId>
-                    <version>1.0.0.RELEASE</version>
+                    <version>${spring-cloud-gcp.version}</version>
                 </dependency>
                 <dependency>
                     <groupId>org.springframework.cloud</groupId>
                     <artifactId>spring-cloud-gcp-starter-sql-mysql</artifactId>
-                    <version>1.0.0.RELEASE</version>
+                    <version>${spring-cloud-gcp.version}</version>
                 </dependency>
             </dependencies>
             <build>
@@ -215,7 +215,7 @@
                     <dependency>
                         <groupId>org.springframework.cloud</groupId>
                         <artifactId>spring-cloud-dependencies</artifactId>
-                        <version>Greenwich.RELEASE</version>
+                        <version>${spring-cloud.version}</version>
                         <type>pom</type>
                         <scope>import</scope>
                     </dependency>
@@ -332,6 +332,8 @@
 
     <properties>
         <servlet.version>4.0.0</servlet.version>
+        <spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
+        <spring-cloud-gcp.version>1.0.0.RELEASE</spring-cloud-gcp.version>
     </properties>
 
 </project>
diff --git a/spring-boot-modules/spring-boot-security/pom.xml b/spring-boot-modules/spring-boot-security/pom.xml
index 33b7cbfd74..3f8d2ff73f 100644
--- a/spring-boot-modules/spring-boot-security/pom.xml
+++ b/spring-boot-modules/spring-boot-security/pom.xml
@@ -71,7 +71,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
-<!--            <version>2.1.1.RELEASE</version>-->
         </dependency>
     </dependencies>
 
diff --git a/spring-boot-modules/spring-boot-swagger-jwt/pom.xml b/spring-boot-modules/spring-boot-swagger-jwt/pom.xml
index d71d7342ce..6ee7db2ac9 100644
--- a/spring-boot-modules/spring-boot-swagger-jwt/pom.xml
+++ b/spring-boot-modules/spring-boot-swagger-jwt/pom.xml
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-boot-starter</artifactId>
-            <version>3.0.0</version>
+            <version>${springfox.version}</version>
         </dependency>
     </dependencies>
 
@@ -38,4 +38,8 @@
         </plugins>
     </build>
 
+    <properties>
+        <springfox.version>3.0.0</springfox.version>
+    </properties>
+
 </project>
diff --git a/spring-boot-modules/spring-boot-swagger/pom.xml b/spring-boot-modules/spring-boot-swagger/pom.xml
index 4e0180460d..2d80cae4d5 100644
--- a/spring-boot-modules/spring-boot-swagger/pom.xml
+++ b/spring-boot-modules/spring-boot-swagger/pom.xml
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-boot-starter</artifactId>
-            <version>3.0.0</version>
+            <version>${springfox.version}</version>
         </dependency>
     </dependencies>
 
@@ -38,4 +38,8 @@
         </plugins>
     </build>
 
+    <properties>
+        <springfox.version>3.0.0</springfox.version>
+    </properties>
+
 </project>

From 6733a4cf15afd03489175998707f44590027e0fb Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztof.woyke.sp@lhsystems.com>
Date: Thu, 25 Mar 2021 13:16:01 +0100
Subject: [PATCH 6/7] JAVA-3295: Fix pom properties in spring-web-modules

---
 spring-web-modules/spring-rest-http-2/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-web-modules/spring-rest-http-2/pom.xml b/spring-web-modules/spring-rest-http-2/pom.xml
index 0ea3fd6840..a349ac1116 100644
--- a/spring-web-modules/spring-rest-http-2/pom.xml
+++ b/spring-web-modules/spring-rest-http-2/pom.xml
@@ -44,12 +44,13 @@
         <dependency>
             <groupId>io.github.resilience4j</groupId>
             <artifactId>resilience4j-timelimiter</artifactId>
-            <version>1.6.1</version>
+            <version>${resilience4j.version}</version>
         </dependency>
     </dependencies>
 
     <properties>
         <swagger2.version>2.9.2</swagger2.version>
+        <resilience4j.version>1.6.1</resilience4j.version>
     </properties>
 
 </project>

From a382f77a64e7423de02187dc8fb8d4516f844610 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztof.woyke.sp@lhsystems.com>
Date: Fri, 26 Mar 2021 12:55:14 +0100
Subject: [PATCH 7/7] JAVA-3295: Remove redundant java.version property

---
 aws-reactive/pom.xml                                         | 1 -
 patterns/clean-architecture/pom.xml                          | 4 ----
 patterns/hexagonal-architecture/pom.xml                      | 4 ----
 persistence-modules/spring-data-cosmosdb/pom.xml             | 2 --
 reactive-systems/inventory-service/pom.xml                   | 4 ----
 reactive-systems/order-service/pom.xml                       | 4 ----
 reactive-systems/shipping-service/pom.xml                    | 4 ----
 .../spring-boot-with-custom-parent/pom.xml                   | 4 ----
 .../spring-boot-with-starter-parent/pom.xml                  | 1 -
 spring-boot-modules/spring-boot-properties-3/pom.xml         | 3 ---
 spring-boot-modules/spring-boot-properties/pom.xml           | 1 -
 spring-boot-modules/spring-boot-springdoc/pom.xml            | 1 -
 spring-cloud/spring-cloud-bootstrap/order-service/pom.xml    | 1 -
 .../spring-cloud-stream/spring-cloud-stream-kafka/pom.xml    | 1 -
 spring-cloud/spring-cloud-zuul-fallback/pom.xml              | 1 -
 spring-web-modules/spring-mvc-views/pom.xml                  | 1 -
 webrtc/pom.xml                                               | 4 ----
 wildfly/pom.xml                                              | 4 ----
 xml/pom.xml                                                  | 5 ++---
 19 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/aws-reactive/pom.xml b/aws-reactive/pom.xml
index d4f0e5e231..6224ccbb99 100644
--- a/aws-reactive/pom.xml
+++ b/aws-reactive/pom.xml
@@ -100,7 +100,6 @@
     </build>
 
     <properties>
-        <java.version>1.8</java.version>
         <spring.version>2.2.1.RELEASE</spring.version>
         <awssdk.version>2.10.27</awssdk.version>
     </properties>
diff --git a/patterns/clean-architecture/pom.xml b/patterns/clean-architecture/pom.xml
index 6e7de78751..b9968095f8 100644
--- a/patterns/clean-architecture/pom.xml
+++ b/patterns/clean-architecture/pom.xml
@@ -15,10 +15,6 @@
         <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
-    <properties>
-        <java.version>1.8</java.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.h2database</groupId>
diff --git a/patterns/hexagonal-architecture/pom.xml b/patterns/hexagonal-architecture/pom.xml
index 62f55c2efa..db7ee69e2e 100644
--- a/patterns/hexagonal-architecture/pom.xml
+++ b/patterns/hexagonal-architecture/pom.xml
@@ -15,10 +15,6 @@
         <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
-	<properties>
-		<java.version>1.8</java.version>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/persistence-modules/spring-data-cosmosdb/pom.xml b/persistence-modules/spring-data-cosmosdb/pom.xml
index 19a66648b2..f3c913195f 100644
--- a/persistence-modules/spring-data-cosmosdb/pom.xml
+++ b/persistence-modules/spring-data-cosmosdb/pom.xml
@@ -14,9 +14,7 @@
     </parent>
     
     <properties>
-        <java.version>1.8</java.version>
         <cosmodb.version>2.3.0</cosmodb.version>
-
     </properties>
     
     <dependencies>
diff --git a/reactive-systems/inventory-service/pom.xml b/reactive-systems/inventory-service/pom.xml
index 4c04afb5cb..b5ec210636 100644
--- a/reactive-systems/inventory-service/pom.xml
+++ b/reactive-systems/inventory-service/pom.xml
@@ -15,10 +15,6 @@
         <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
-    <properties>
-        <java.version>1.8</java.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/reactive-systems/order-service/pom.xml b/reactive-systems/order-service/pom.xml
index c793f448b5..603f0373ba 100644
--- a/reactive-systems/order-service/pom.xml
+++ b/reactive-systems/order-service/pom.xml
@@ -15,10 +15,6 @@
         <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
-    <properties>
-        <java.version>1.8</java.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/reactive-systems/shipping-service/pom.xml b/reactive-systems/shipping-service/pom.xml
index 72487e691e..458b91b6ce 100644
--- a/reactive-systems/shipping-service/pom.xml
+++ b/reactive-systems/shipping-service/pom.xml
@@ -15,10 +15,6 @@
         <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
-    <properties>
-        <java.version>1.8</java.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/spring-boot-modules/spring-boot-parent/spring-boot-with-custom-parent/pom.xml b/spring-boot-modules/spring-boot-parent/spring-boot-with-custom-parent/pom.xml
index 5f5d3a9f6a..63d6078eca 100644
--- a/spring-boot-modules/spring-boot-parent/spring-boot-with-custom-parent/pom.xml
+++ b/spring-boot-modules/spring-boot-parent/spring-boot-with-custom-parent/pom.xml
@@ -23,8 +23,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <java.version>1.8</java.version>
-    </properties>
-
 </project>
diff --git a/spring-boot-modules/spring-boot-parent/spring-boot-with-starter-parent/pom.xml b/spring-boot-modules/spring-boot-parent/spring-boot-with-starter-parent/pom.xml
index 108e66b68e..4274f63aa3 100644
--- a/spring-boot-modules/spring-boot-parent/spring-boot-with-starter-parent/pom.xml
+++ b/spring-boot-modules/spring-boot-parent/spring-boot-with-starter-parent/pom.xml
@@ -39,7 +39,6 @@
     </dependencies>
 
     <properties>
-        <java.version>1.8</java.version>
         <spring-boot-starter-data-jpa.version>2.2.5.RELEASE</spring-boot-starter-data-jpa.version>
     </properties>
 </project>
diff --git a/spring-boot-modules/spring-boot-properties-3/pom.xml b/spring-boot-modules/spring-boot-properties-3/pom.xml
index 809fd6e2d4..33799b557d 100644
--- a/spring-boot-modules/spring-boot-properties-3/pom.xml
+++ b/spring-boot-modules/spring-boot-properties-3/pom.xml
@@ -14,9 +14,6 @@
     <name>spring-boot-properties-3</name>
     <description>Spring Boot Properties Module</description>
 
-    <properties>
-        <java.version>1.8</java.version>
-    </properties>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/spring-boot-modules/spring-boot-properties/pom.xml b/spring-boot-modules/spring-boot-properties/pom.xml
index 40668f47fd..0a7d8a8cbf 100644
--- a/spring-boot-modules/spring-boot-properties/pom.xml
+++ b/spring-boot-modules/spring-boot-properties/pom.xml
@@ -134,7 +134,6 @@
     </repositories>
 
     <properties>
-        <java.version>1.8</java.version>
         <spring-cloud.version>2020.0.0-M5</spring-cloud.version>
         <commons-configuration.version>1.10</commons-configuration.version>
         <guava.version>20.0</guava.version>
diff --git a/spring-boot-modules/spring-boot-springdoc/pom.xml b/spring-boot-modules/spring-boot-springdoc/pom.xml
index 259383a1d2..8442504fed 100644
--- a/spring-boot-modules/spring-boot-springdoc/pom.xml
+++ b/spring-boot-modules/spring-boot-springdoc/pom.xml
@@ -169,7 +169,6 @@
     </build>
 
     <properties>
-        <java.version>1.8</java.version>
         <hibernate.version>5.2.10.Final</hibernate.version>
         <springdoc.version>1.5.2</springdoc.version>
         <asciidoctor-plugin.version>1.5.6</asciidoctor-plugin.version>
diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/pom.xml b/spring-cloud/spring-cloud-bootstrap/order-service/pom.xml
index a32bd5a2d3..2ebc673ef4 100644
--- a/spring-cloud/spring-cloud-bootstrap/order-service/pom.xml
+++ b/spring-cloud/spring-cloud-bootstrap/order-service/pom.xml
@@ -112,7 +112,6 @@
     </build>
 
     <properties>
-        <java.version>1.8</java.version>
         <commons-lang.version>2.6</commons-lang.version>
         <structure-maven.version>0.0.2</structure-maven.version>
         <maven.compiler.source>1.8</maven.compiler.source>
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/pom.xml b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/pom.xml
index 52230dd1c1..32a31c3042 100644
--- a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/pom.xml
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/pom.xml
@@ -101,7 +101,6 @@
     </repositories>
 
     <properties>
-        <java.version>1.8</java.version>
         <spring-cloud.version>Greenwich.SR1</spring-cloud.version>
         <kafka-avro-serializer.version>4.0.0</kafka-avro-serializer.version>
         <avro.version>1.8.2</avro.version>
diff --git a/spring-cloud/spring-cloud-zuul-fallback/pom.xml b/spring-cloud/spring-cloud-zuul-fallback/pom.xml
index cb762eb099..42925a6ab9 100644
--- a/spring-cloud/spring-cloud-zuul-fallback/pom.xml
+++ b/spring-cloud/spring-cloud-zuul-fallback/pom.xml
@@ -21,7 +21,6 @@
     </modules>
 
     <properties>
-        <java.version>1.8</java.version>
         <spring-cloud-dependencies.version>Finchley.SR2</spring-cloud-dependencies.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
     </properties>
diff --git a/spring-web-modules/spring-mvc-views/pom.xml b/spring-web-modules/spring-mvc-views/pom.xml
index 2e80a60966..649814263c 100644
--- a/spring-web-modules/spring-mvc-views/pom.xml
+++ b/spring-web-modules/spring-mvc-views/pom.xml
@@ -111,7 +111,6 @@
     </build>
 
     <properties>
-        <java.version>1.8</java.version>
         <javax.servlet.jsp-api.version>2.3.3</javax.servlet.jsp-api.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
         <spring.version>5.2.1.RELEASE</spring.version>
diff --git a/webrtc/pom.xml b/webrtc/pom.xml
index f302ae97a2..191ff11dd6 100644
--- a/webrtc/pom.xml
+++ b/webrtc/pom.xml
@@ -31,8 +31,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <java.version>1.8</java.version>
-    </properties>
-
 </project>
diff --git a/wildfly/pom.xml b/wildfly/pom.xml
index 7b2a474c8d..6d823bb4c9 100644
--- a/wildfly/pom.xml
+++ b/wildfly/pom.xml
@@ -76,8 +76,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <java.version>1.8</java.version>
-    </properties>
-
 </project>
diff --git a/xml/pom.xml b/xml/pom.xml
index 837f918b46..cd337eb76e 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -322,8 +322,8 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
                         <configuration>
-                            <source>${java-version}</source>
-                            <target>${java-version}</target>
+                            <source>${java.version}</source>
+                            <target>${java.version}</target>
                         </configuration>
                     </plugin>
                     <plugin>
@@ -379,7 +379,6 @@
         <mustache.version>0.9.6</mustache.version>
         <!-- util -->
         <commons-lang.version>2.4</commons-lang.version>
-        <java-version>1.8</java-version>
 
         <!-- maven plugins -->
         <maven-jibx-plugin.version>1.3.1</maven-jibx-plugin.version>