From 94b88847321f59dde25339a705b503f78c109099 Mon Sep 17 00:00:00 2001
From: Oleksandr Zhevedenko <720803+Net-burst@users.noreply.github.com>
Date: Fri, 26 Apr 2024 13:49:53 -0400
Subject: [PATCH] Consolidate Java version properties across all pom.xml files

---
 extra/bundle/pom.xml  | 1 -
 extra/modules/pom.xml | 1 -
 extra/pom.xml         | 5 +++--
 pom.xml               | 1 -
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/extra/bundle/pom.xml b/extra/bundle/pom.xml
index 2c66f1b22f2..7f1adad0d6c 100644
--- a/extra/bundle/pom.xml
+++ b/extra/bundle/pom.xml
@@ -17,7 +17,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>21</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <spring.boot.version>2.5.6</spring.boot.version>
diff --git a/extra/modules/pom.xml b/extra/modules/pom.xml
index 0d442c3d4ef..5091a3e3a65 100644
--- a/extra/modules/pom.xml
+++ b/extra/modules/pom.xml
@@ -25,7 +25,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>21</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
 
diff --git a/extra/pom.xml b/extra/pom.xml
index 7b8a60f2108..90192cc0325 100644
--- a/extra/pom.xml
+++ b/extra/pom.xml
@@ -15,10 +15,11 @@
     </scm>
 
     <properties>
+        <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
         <vertx.version>4.5.5</vertx.version>
         <lombok.version>1.18.30</lombok.version>
         <maven-release-plugin.version>3.0.0-M6</maven-release-plugin.version>
diff --git a/pom.xml b/pom.xml
index 0545e9ad7d9..17736c0daa2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>21</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <dockerfileName>Dockerfile</dockerfileName>