From ca571dd9b3e14b5faa889fff83855bf499646738 Mon Sep 17 00:00:00 2001
From: Alex Martel <13215031+manofthepeace@users.noreply.github.com>
Date: Tue, 2 Jul 2024 19:25:18 -0400
Subject: [PATCH 1/3] Make mvnd 1.X work

---
 .mvn/maven.config | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .mvn/maven.config

diff --git a/.mvn/maven.config b/.mvn/maven.config
new file mode 100644
index 0000000000000..0f4fa3c8a6eae
--- /dev/null
+++ b/.mvn/maven.config
@@ -0,0 +1 @@
+-Dmaven.multiModuleProjectDirectory=${session.rootDirectory}
\ No newline at end of file

From c5ffe30cdb125191f54d647f970588581febb984 Mon Sep 17 00:00:00 2001
From: Guillaume Smet <guillaume.smet@gmail.com>
Date: Mon, 8 Jul 2024 17:03:52 +0200
Subject: [PATCH 2/3] Require at least Maven 3.9.6 to build Quarkus

---
 independent-projects/parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/independent-projects/parent/pom.xml b/independent-projects/parent/pom.xml
index 5d2c28da28836..bffc08d84c341 100644
--- a/independent-projects/parent/pom.xml
+++ b/independent-projects/parent/pom.xml
@@ -73,7 +73,7 @@
         <maven.compiler.argument.testSource>${maven.compiler.testSource}</maven.compiler.argument.testSource>
 
         <!-- maven-enforcer-plugin -->
-        <maven.min.version>3.8.6</maven.min.version>
+        <maven.min.version>3.9.6</maven.min.version>
         <jdk.min.version>${maven.compiler.argument.source}</jdk.min.version>
         <insecure.repositories>ERROR</insecure.repositories>
 

From 6e862d01f842e2c975a12fae5b17cd8fe052dc29 Mon Sep 17 00:00:00 2001
From: Guillaume Smet <guillaume.smet@gmail.com>
Date: Tue, 9 Jul 2024 09:41:07 +0200
Subject: [PATCH 3/3] Make sure we use the Maven wrapper everywhere

---
 integration-tests/gradle/update-dependencies.sh | 2 +-
 tcks/resteasy-reactive/update-dependencies.sh   | 2 +-
 update-extension-dependencies.sh                | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/integration-tests/gradle/update-dependencies.sh b/integration-tests/gradle/update-dependencies.sh
index 11bea4fa36049..15b710020cccd 100755
--- a/integration-tests/gradle/update-dependencies.sh
+++ b/integration-tests/gradle/update-dependencies.sh
@@ -87,7 +87,7 @@ echo ''
 echo 'Sanity check...'
 echo ''
 # sanity check; make sure nothing stupid was added like non-existing deps
-mvn -Dscan=false dependency:resolve validate -Dsilent -q -f "${PRG_PATH}" $*
+${PRG_PATH}/../../mvnw -Dscan=false dependency:resolve validate -Dsilent -q -f "${PRG_PATH}" $*
 
 # CI only: verify that no pom.xml was touched (if changes are found, committer forgot to run script or to add changes)
 if [ "${CI:-}" == true ] && [ $(git status -s -u no '*pom.xml' | wc -l) -ne 0 ]
diff --git a/tcks/resteasy-reactive/update-dependencies.sh b/tcks/resteasy-reactive/update-dependencies.sh
index cdd12aab128b5..21435d21b92ba 100755
--- a/tcks/resteasy-reactive/update-dependencies.sh
+++ b/tcks/resteasy-reactive/update-dependencies.sh
@@ -90,7 +90,7 @@ echo ''
 echo 'Sanity check...'
 echo ''
 # sanity check; make sure nothing stupid was added like non-existing deps
-mvn -Dscan=false dependency:resolve validate -Dsilent -q -f "${PRG_PATH}" $*
+${PRG_PATH}/../../mvnw -Dscan=false dependency:resolve validate -Dsilent -q -f "${PRG_PATH}" $*
 
 # CI only: verify that no pom.xml was touched (if changes are found, committer forgot to run script or to add changes)
 if [ "${CI:-}" == true ] && [ $(git status -s -u no '*pom.xml' | wc -l) -ne 0 ]
diff --git a/update-extension-dependencies.sh b/update-extension-dependencies.sh
index b82c138e67fc4..e98c85fbe3e67 100755
--- a/update-extension-dependencies.sh
+++ b/update-extension-dependencies.sh
@@ -14,7 +14,7 @@ then
   echo ''
   echo 'Building bom-descriptor-json...'
   echo ''
-  mvn -q -e -Dscan=false clean package -f "${PRG_PATH}/devtools/bom-descriptor-json" -Denforcer.skip $*
+  ./mvnw -q -e -Dscan=false clean package -f "${PRG_PATH}/devtools/bom-descriptor-json" -Denforcer.skip $*
 else
   read -n1 -p 'Build the entire project with relocations? [y/n] ' ANSWER
   echo ''
@@ -23,7 +23,7 @@ else
     echo ''
     echo 'Building entire project with relocations...'
     echo ''
-    mvn -q -e -Dscan=false -Dquickly -Dno-test-modules -Prelocations -T0.8C -f "${PRG_PATH}" $*
+    ./mvnw -q -e -Dscan=false -Dquickly -Dno-test-modules -Prelocations -T0.8C -f "${PRG_PATH}" $*
   else
     echo ''
     echo 'Aborted!'
@@ -112,7 +112,7 @@ echo ''
 echo 'Sanity check...'
 echo ''
 # sanity check; make sure nothing stupid was added like non-existing deps
-mvn -Dscan=false dependency:resolve validate -Dsilent -q -f "${PRG_PATH}" -pl devtools/bom-descriptor-json,docs $*
+./mvnw -Dscan=false dependency:resolve validate -Dsilent -q -f "${PRG_PATH}" -pl devtools/bom-descriptor-json,docs $*
 
 # CI only: verify that no pom.xml was touched (if changes are found, committer forgot to run script or to add changes)
 if [ "${CI:-}" == true ] && [ $(git status -s -u no '*pom.xml' | wc -l) -ne 0 ]