From e3830919f08c8198d1c60c8c29a4dbd8dbd8413b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= <hboutemy@apache.org>
Date: Thu, 26 Mar 2026 21:34:48 +0100
Subject: [PATCH 1/2] enable build with Maven 4

---
 .github/workflows/maven-verify.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
index 932827cf..a8cd280e 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -25,3 +25,5 @@ jobs:
   build:
     name: Verify
     uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4
+    with:
+      maven4-enabled: true
\ No newline at end of file

From 13070d143da3c865fd41aff51339b2313c205aa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= <hboutemy@apache.org>
Date: Fri, 27 Mar 2026 21:36:16 +0100
Subject: [PATCH 2/2] upgrade Surefire 2 to 3

---
 src/it/MRESOURCES-18/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/it/MRESOURCES-18/pom.xml b/src/it/MRESOURCES-18/pom.xml
index dca439ab..153ac06c 100644
--- a/src/it/MRESOURCES-18/pom.xml
+++ b/src/it/MRESOURCES-18/pom.xml
@@ -57,7 +57,7 @@ under the License.
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.4.3</version>
+        <version>3.2.1</version>
         <configuration>
           <systemProperties>
             <!-- pass this system property through to the tests -->