From be9680d5b200f782e5571706e1841b342d819c0a Mon Sep 17 00:00:00 2001
From: Alexey Loubyansky <olubyans@redhat.com>
Date: Tue, 4 Jul 2023 08:56:13 +0200
Subject: [PATCH] Upgrade to Maven 3.9.3

---
 build-parent/pom.xml                                          | 2 +-
 independent-projects/bootstrap/pom.xml                        | 4 ++--
 independent-projects/extension-maven-plugin/pom.xml           | 3 ++-
 independent-projects/resteasy-reactive/pom.xml                | 2 +-
 .../codestarts/quarkus/tooling/gradle-wrapper/codestart.yml   | 2 +-
 .../codestarts/quarkus/tooling/maven-wrapper/codestart.yml    | 4 ++--
 independent-projects/tools/pom.xml                            | 3 +--
 7 files changed, 10 insertions(+), 10 deletions(-)
 rename independent-projects/tools/base-codestarts/src/main/{resources => filtered}/codestarts/quarkus/tooling/gradle-wrapper/codestart.yml (80%)
 rename independent-projects/tools/base-codestarts/src/main/{resources => filtered}/codestarts/quarkus/tooling/maven-wrapper/codestart.yml (64%)

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 482d4e6ec7fe2..0570710405cf6 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -64,7 +64,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.2</proposed-maven-version>
+        <proposed-maven-version>3.9.3</proposed-maven-version>
         <maven-wrapper.version>3.2.0</maven-wrapper.version>
         <gradle-wrapper.version>8.1.1</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 26d3d8e5c330b..bd421a94866df 100644
--- a/independent-projects/bootstrap/pom.xml
+++ b/independent-projects/bootstrap/pom.xml
@@ -48,10 +48,10 @@
         <eclipse-minimal-json.version>0.9.5</eclipse-minimal-json.version>
         <jboss-logging.version>3.5.1.Final</jboss-logging.version>
         <junit.jupiter.version>5.9.3</junit.jupiter.version>
-        <maven-core.version>3.9.2</maven-core.version><!-- Keep in sync with sisu.version -->
+        <maven-core.version>3.9.3</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.10</maven-resolver.version>
+        <maven-resolver.version>1.9.13</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/extension-maven-plugin/pom.xml b/independent-projects/extension-maven-plugin/pom.xml
index 8827c5a40cb4a..d61c6de0d2097 100644
--- a/independent-projects/extension-maven-plugin/pom.xml
+++ b/independent-projects/extension-maven-plugin/pom.xml
@@ -37,6 +37,7 @@
         <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.3</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.0.0</version.surefire.plugin>
@@ -386,7 +387,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-compat</artifactId>
-            <version>3.8.8</version>
+            <version>${maven-core.version}</version>
             <scope>test</scope>
         </dependency>
         <!-- Needed for system stubs -->
diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml
index d891fffb3f265..0df9ca60b35a6 100644
--- a/independent-projects/resteasy-reactive/pom.xml
+++ b/independent-projects/resteasy-reactive/pom.xml
@@ -51,7 +51,7 @@
         <jandex.version>3.1.2</jandex.version>
         <bytebuddy.version>1.12.12</bytebuddy.version>
         <junit5.version>5.9.3</junit5.version>
-        <maven.version>3.8.8</maven.version>
+        <maven.version>3.9.3</maven.version>
         <assertj.version>3.24.2</assertj.version>
         <jboss-logging.version>3.5.1.Final</jboss-logging.version>
         <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/gradle-wrapper/codestart.yml b/independent-projects/tools/base-codestarts/src/main/filtered/codestarts/quarkus/tooling/gradle-wrapper/codestart.yml
similarity index 80%
rename from independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/gradle-wrapper/codestart.yml
rename to independent-projects/tools/base-codestarts/src/main/filtered/codestarts/quarkus/tooling/gradle-wrapper/codestart.yml
index b7d647cc2e521..8e200cd9750d1 100644
--- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/gradle-wrapper/codestart.yml
+++ b/independent-projects/tools/base-codestarts/src/main/filtered/codestarts/quarkus/tooling/gradle-wrapper/codestart.yml
@@ -6,7 +6,7 @@ language:
   base:
     data:
       gradle:
-        version: 8.1.1
+        version: ${gradle-wrapper.version}
     shared-data:
       buildtool:
         cli: ./gradlew
diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/maven-wrapper/codestart.yml b/independent-projects/tools/base-codestarts/src/main/filtered/codestarts/quarkus/tooling/maven-wrapper/codestart.yml
similarity index 64%
rename from independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/maven-wrapper/codestart.yml
rename to independent-projects/tools/base-codestarts/src/main/filtered/codestarts/quarkus/tooling/maven-wrapper/codestart.yml
index fbfdf826ba658..fccf2a11977d4 100644
--- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/maven-wrapper/codestart.yml
+++ b/independent-projects/tools/base-codestarts/src/main/filtered/codestarts/quarkus/tooling/maven-wrapper/codestart.yml
@@ -6,8 +6,8 @@ language:
   base:
     data:
       maven:
-        version: 3.8.8
-        wrapper-version: 3.2.0
+        version: ${proposed-maven-version}
+        wrapper-version: ${maven-wrapper.version}
     shared-data:
       buildtool:
         cli: ./mvnw
diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml
index 7303c831a0c2f..3b38c430d91e9 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.8.8</proposed-maven-version>
+        <proposed-maven-version>3.9.3</proposed-maven-version>
         <maven-wrapper.version>3.2.0</maven-wrapper.version>
         <gradle-wrapper.version>8.1.1</gradle-wrapper.version>
 
@@ -58,7 +58,6 @@
         <junit.version>5.9.3</junit.version>
         <commons-compress.version>1.23.0</commons-compress.version>
         <jboss-logging.version>3.5.1.Final</jboss-logging.version>
-        <maven-core.version>3.9.1</maven-core.version>
         <mockito.version>5.3.1</mockito.version>
         <version.enforcer.plugin>3.2.1</version.enforcer.plugin>
         <version.surefire.plugin>3.0.0</version.surefire.plugin>