From 2c06f09057706560bdfdb1ccc67b28674b36545e Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sun, 20 Sep 2026 15:48:43 +0200 Subject: [PATCH 1/3] Verify with Maven 4 too Adds the Maven 4 line to the shared verify matrix, as most of the estate already does, so incompatibilities show in CI rather than at a user. --- .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 51f3c3a..3acefcf 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@v5 + with: + maven4-enabled: true From 143feac4a2c4d04e60238d8f3bdf7bca4fecd290 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Mon, 21 Sep 2026 09:59:25 +0200 Subject: [PATCH 2/3] Use maven-remote-resources-plugin 3.3.0 in the shared-resources test project Version 1.0 resolves the resource bundle through the Maven 2 artifact resolver, which finds nothing on Maven 4. --- .../src/test/resources/maven-projects/shared-resources/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source-release/src/test/resources/maven-projects/shared-resources/pom.xml b/source-release/src/test/resources/maven-projects/shared-resources/pom.xml index 3b3caa2..858c808 100644 --- a/source-release/src/test/resources/maven-projects/shared-resources/pom.xml +++ b/source-release/src/test/resources/maven-projects/shared-resources/pom.xml @@ -41,7 +41,7 @@ under the License. maven-remote-resources-plugin - 1.0 + 3.3.0 From 4865458972e74680b816280629d29f05d8b98138 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Mon, 21 Sep 2026 10:35:47 +0200 Subject: [PATCH 3/3] Keep the zip-and-tar IT log outside the test project Maven 4 on Windows holds its log file open, so the clean before the build failed to delete target/log.txt. --- .../src/test/java/org/apache/its/ITZipAndTarCreation.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/source-release/src/test/java/org/apache/its/ITZipAndTarCreation.java b/source-release/src/test/java/org/apache/its/ITZipAndTarCreation.java index ae7150a..b3bb079 100644 --- a/source-release/src/test/java/org/apache/its/ITZipAndTarCreation.java +++ b/source-release/src/test/java/org/apache/its/ITZipAndTarCreation.java @@ -19,7 +19,6 @@ package org.apache.its; import java.io.File; -import java.nio.file.Files; import java.util.Collections; import java.util.HashSet; import java.util.Set; @@ -45,9 +44,9 @@ void execute() throws Exception { File testDir = getTestDir(BASENAME); Verifier verifier = createVerifier(testDir); - // to avoid saving logs in current project dir - Files.createDirectories(testDir.toPath().resolve("target")); - verifier.setLogFileName("target/log.txt"); + // keep the log out of the project, so it is neither packaged nor deleted by the clean that + // precedes the build (Maven 4 on Windows holds its log file open and the delete fails) + verifier.setLogFileName("../" + BASENAME + "-log.txt"); verifier.addCliArgument("package"); verifier.execute();