Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/maven-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]'
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ under the License.
</distributionManagement>

<properties>
<mavenVersion>4.0.0-rc-4</mavenVersion>
<mavenVersion>4.0.0-rc-6</mavenVersion>
<javaVersion>17</javaVersion>

<guiceVersion>7.0.0</guiceVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <skip>. Reading both is what makes
// <skip>true</skip> 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()) {
Comment thread
desruisseaux marked this conversation as resolved.
getLog().info("Not copying test resources");
return;
}
Expand Down
Loading