diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index e86e064..41b374b 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -26,6 +26,6 @@ jobs: name: Verify uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v5 with: - ff-maven: "4.0.0-rc-4" # Maven version for fail-fast-build - maven-matrix: '[ "4.0.0-rc-4" ]' + ff-maven: "4.0.0-rc-6" # Maven version for fail-fast-build + maven-matrix: '[ "4.0.0-rc-6" ]' jdk-matrix: '[ "17", "21" ]' diff --git a/pom.xml b/pom.xml index 6775252..32152c2 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ under the License. - 4.0.0-rc-4 + 4.0.0-rc-6 17 7.0.0 diff --git a/src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java b/src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java index 1e1218d..e9c6fd9 100644 --- a/src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java +++ b/src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java @@ -62,7 +62,17 @@ public class TestResourcesMojo extends ResourcesMojo { * {@inheritDoc} */ public void execute() throws MojoException { - if (skip) { + // isSkip() reads ResourcesMojo's own field. Both classes declare a private + // "skip", so the two collapse into a single descriptor parameter and the + // configurator writes the superclass one, leaving this class's field false + // however the build configured . Reading both is what makes + // true reach this goal at all. + // + // TODO temporary: drop the isSkip() half once apache/maven#12626 is in a + // release. That fixes the cause in the core configurator, where + // buildFieldCache() lets a parent field shadow the child's, and then this + // class's own field will be configured directly. + if (skip || isSkip()) { getLog().info("Not copying test resources"); return; }