From 06aedf9433b3f12545b2271e436a964b66d8833f Mon Sep 17 00:00:00 2001
From: Oleksandr Zhevedenko <720803+Net-burst@users.noreply.github.com>
Date: Fri, 26 Apr 2024 23:07:54 -0400
Subject: [PATCH] Sanitize pom properties

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

diff --git a/extra/bundle/pom.xml b/extra/bundle/pom.xml
index 7f1adad0d6c..6bfc9aea68d 100644
--- a/extra/bundle/pom.xml
+++ b/extra/bundle/pom.xml
@@ -19,7 +19,6 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <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>
     </properties>
 
     <dependencies>
diff --git a/extra/modules/pom.xml b/extra/modules/pom.xml
index b683ee99b2d..465d53e18f7 100644
--- a/extra/modules/pom.xml
+++ b/extra/modules/pom.xml
@@ -27,9 +27,6 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-
-        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
-        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
     </properties>
 
     <dependencyManagement>
diff --git a/extra/pom.xml b/extra/pom.xml
index 4e371d3d20a..001d5db6d5e 100644
--- a/extra/pom.xml
+++ b/extra/pom.xml
@@ -16,15 +16,21 @@
 
     <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>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
+
         <spring.boot.version>3.2.3</spring.boot.version>
         <vertx.version>4.5.5</vertx.version>
         <lombok.version>1.18.32</lombok.version>
         <testcontainers.version>1.19.7</testcontainers.version>
+
         <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
+        <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
+        <maven-failsafe-plugin.version>${maven-surefire-plugin.version}</maven-failsafe-plugin.version>
     </properties>
 
     <modules>
diff --git a/pom.xml b/pom.xml
index 1ecf285f77f..11826a82314 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,9 +66,6 @@
         <download-plugin.version>1.2.0</download-plugin.version>
         <jacoco-plugin.version>0.8.11</jacoco-plugin.version>
         <git-commmit-plugin.version>2.2.4</git-commmit-plugin.version>
-        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
-        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
-        <maven-failsafe-plugin.version>${maven-surefire-plugin.version}</maven-failsafe-plugin.version>
         <docker-maven-plugin.version>0.40.2</docker-maven-plugin.version>
         <gmavenplus-plugin.version>3.0.2</gmavenplus-plugin.version>
         <skipFunctionalTests>false</skipFunctionalTests>
@@ -812,8 +809,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>21</source>
-                    <target>21</target>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
                 </configuration>
             </plugin>
         </plugins>