From 0719a47df6c6c98efb77769f1e06fbc8fb7f7ca4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Sol=C3=B3rzano?= <jorsol@gmail.com>
Date: Fri, 1 Dec 2023 12:49:20 +0100
Subject: [PATCH] Update Apache Maven to 3.9.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jorge Solórzano <jorsol@gmail.com>
(cherry picked from commit 51ac094d2cb67670c95d76b395816d2f57ef0272)
---
 build-parent/pom.xml                                      | 2 +-
 independent-projects/bootstrap/pom.xml                    | 8 ++++----
 independent-projects/enforcer-rules/pom.xml               | 2 +-
 independent-projects/extension-maven-plugin/pom.xml       | 4 ++--
 independent-projects/resteasy-reactive/pom.xml            | 2 +-
 .../devtools-testing/src/main/resources/fake-catalog.json | 2 +-
 independent-projects/tools/pom.xml                        | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 1866362b5538f..14eeb01c05c7a 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -62,7 +62,7 @@
         <supported-maven-versions>[3.8.2,)</supported-maven-versions>
 
         <!-- These 2 properties are used by CreateProjectMojo to add the Maven Wrapper -->
-        <proposed-maven-version>3.9.5</proposed-maven-version>
+        <proposed-maven-version>3.9.6</proposed-maven-version>
         <maven-wrapper.version>3.2.0</maven-wrapper.version>
         <gradle-wrapper.version>8.5</gradle-wrapper.version>
         <quarkus-gradle-plugin.version>${project.version}</quarkus-gradle-plugin.version>
diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml
index d966792760d95..42aa44afb02e2 100644
--- a/independent-projects/bootstrap/pom.xml
+++ b/independent-projects/bootstrap/pom.xml
@@ -47,10 +47,10 @@
         <eclipse-minimal-json.version>0.9.5</eclipse-minimal-json.version>
         <jboss-logging.version>3.5.3.Final</jboss-logging.version>
         <junit.jupiter.version>5.10.0</junit.jupiter.version>
-        <maven-core.version>3.9.5</maven-core.version><!-- Keep in sync with sisu.version -->
-        <sisu.version>0.3.5</sisu.version><!-- Keep in sync with maven-core.version -->
-        <maven-plugin-annotations.version>3.7.1</maven-plugin-annotations.version>
-        <maven-resolver.version>1.9.13</maven-resolver.version>
+        <maven-core.version>3.9.6</maven-core.version><!-- Keep in sync with sisu.version -->
+        <sisu.version>0.9.0.M2</sisu.version><!-- Keep in sync with maven-core.version -->
+        <maven-plugin-annotations.version>3.10.2</maven-plugin-annotations.version>
+        <maven-resolver.version>1.9.18</maven-resolver.version>
         <maven-shared-utils.version>3.3.4</maven-shared-utils.version> <!-- Keep in sync with maven-core.version (force this version on maven-invoker) -->
         <maven-wagon.version>3.5.3</maven-wagon.version>
         <httpcore.version>4.4.16</httpcore.version><!-- Keep in sync with maven-wagon.version (wagon-http 3.4.3 brings in 4.4.13 and 4.4.14) -->
diff --git a/independent-projects/enforcer-rules/pom.xml b/independent-projects/enforcer-rules/pom.xml
index 3be3e3b40c112..b257ed3a2aebf 100644
--- a/independent-projects/enforcer-rules/pom.xml
+++ b/independent-projects/enforcer-rules/pom.xml
@@ -40,7 +40,7 @@
         <!-- Keeping 3.0.0.M3 because 3.2.1 requires class changes -->
         <enforcer-api.version>3.0.0-M3</enforcer-api.version>
         <maven-invoker-plugin.version>3.6.0</maven-invoker-plugin.version>
-        <maven-core.version>3.9.5</maven-core.version>
+        <maven-core.version>3.9.6</maven-core.version>
 
         <!--
            Supported Maven versions, interpreted as a version range (Also defined in build-parent)
diff --git a/independent-projects/extension-maven-plugin/pom.xml b/independent-projects/extension-maven-plugin/pom.xml
index 165bdf86493a8..909d80325c1ff 100644
--- a/independent-projects/extension-maven-plugin/pom.xml
+++ b/independent-projects/extension-maven-plugin/pom.xml
@@ -37,11 +37,11 @@
         <maven.compiler.target>11</maven.compiler.target>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.release>11</maven.compiler.release>
-        <maven-core.version>3.9.5</maven-core.version>
+        <maven-core.version>3.9.6</maven-core.version>
         <version.compiler.plugin>3.11.0</version.compiler.plugin>
         <version.enforcer.plugin>3.2.1</version.enforcer.plugin>
         <version.surefire.plugin>3.1.2</version.surefire.plugin>
-        <maven-plugin-plugin.version>3.8.1</maven-plugin-plugin.version>
+        <maven-plugin-plugin.version>3.10.2</maven-plugin-plugin.version>
         <jackson-bom.version>2.15.3</jackson-bom.version>
         <smallrye-beanbag.version>1.3.2</smallrye-beanbag.version>
         <junit.jupiter.version>5.10.0</junit.jupiter.version>
diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml
index 4b60545273467..5089c255879c7 100644
--- a/independent-projects/resteasy-reactive/pom.xml
+++ b/independent-projects/resteasy-reactive/pom.xml
@@ -51,7 +51,7 @@
         <jandex.version>3.1.6</jandex.version>
         <bytebuddy.version>1.12.12</bytebuddy.version>
         <junit5.version>5.10.0</junit5.version>
-        <maven.version>3.9.5</maven.version>
+        <maven.version>3.9.6</maven.version>
         <assertj.version>3.24.2</assertj.version>
         <jboss-logging.version>3.5.3.Final</jboss-logging.version>
         <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
diff --git a/independent-projects/tools/devtools-testing/src/main/resources/fake-catalog.json b/independent-projects/tools/devtools-testing/src/main/resources/fake-catalog.json
index 281043c650de9..b6e8a6310329c 100644
--- a/independent-projects/tools/devtools-testing/src/main/resources/fake-catalog.json
+++ b/independent-projects/tools/devtools-testing/src/main/resources/fake-catalog.json
@@ -388,7 +388,7 @@
         "supported-maven-versions": "[3.6.2,)",
         "minimum-java-version": "11",
         "recommended-java-version": "17",
-        "proposed-maven-version": "3.9.5",
+        "proposed-maven-version": "3.9.6",
         "maven-wrapper-version": "3.2.0",
         "gradle-wrapper-version": "8.5"
       }
diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml
index e991dd082c987..04c84fd510066 100644
--- a/independent-projects/tools/pom.xml
+++ b/independent-projects/tools/pom.xml
@@ -40,7 +40,7 @@
         <maven.compiler.release>11</maven.compiler.release>
 
         <!-- These properties are used by CreateProjectMojo to add the Maven Wrapper -->
-        <proposed-maven-version>3.9.5</proposed-maven-version>
+        <proposed-maven-version>3.9.6</proposed-maven-version>
         <maven-wrapper.version>3.2.0</maven-wrapper.version>
         <gradle-wrapper.version>8.5</gradle-wrapper.version>