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

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

diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
index 19cfd85c..065619be 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -25,7 +25,6 @@ jobs:
   build:
     name: Verify
     uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4
-# still fails
-#    with:
-#      maven4-enabled: true
+    with:
+      maven4-enabled: true
 

From dd96008e497a555ad239d58213d2e6ca77b54bf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= <hboutemy@apache.org>
Date: Sat, 13 Jun 2026 17:40:57 +0200
Subject: [PATCH 2/2] work around Maven 4 CLI lack of interpolation

---
 src/it/deploy-attached-sources/test.properties  | 10 +++++-----
 src/it/deploy-default-packaging/test.properties |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/it/deploy-attached-sources/test.properties b/src/it/deploy-attached-sources/test.properties
index c1c2cd31..2caa287d 100644
--- a/src/it/deploy-attached-sources/test.properties
+++ b/src/it/deploy-attached-sources/test.properties
@@ -16,10 +16,10 @@
 # under the License.
 
 # Properties passed to invocations of the deploy plugin
-pomFile = ${basedir}/pom.xml
+pomFile = pom.xml
 
-file = ${basedir}/target/${project.artifactId}-${project.version}.jar
-sources = ${basedir}/target/${project.artifactId}-${project.version}-sources.jar
-javadoc = ${basedir}/target/${project.artifactId}-${project.version}-javadoc.jar
+file = target/test-1.0-SNAPSHOT.jar
+sources = target/test-1.0-SNAPSHOT-sources.jar
+javadoc = target/test-1.0-SNAPSHOT-javadoc.jar
 
-url = file://${basedir}/target/repo
+url=file:./target/repo
diff --git a/src/it/deploy-default-packaging/test.properties b/src/it/deploy-default-packaging/test.properties
index d663c307..ff7989dd 100644
--- a/src/it/deploy-default-packaging/test.properties
+++ b/src/it/deploy-default-packaging/test.properties
@@ -19,5 +19,5 @@
 groupId = org.apache.maven.test
 artifactId = test
 version = 1.1
-file = ${basedir}/lib/test-1.1.jar
-url = file://${basedir}/target/repo
+file = lib/test-1.1.jar
+url = file:./target/repo