Add module-aware resource handling for modular sources #11505
+395
−6
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Author
|
Hi @desruisseaux, I'd be happy to get some feedback from you (cf. my mail to the dev mailing list as of today), before making this an official PR. Thanks |
desruisseaux
reviewed
Dec 3, 2025
impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Outdated
Show resolved
Hide resolved
desruisseaux
reviewed
Dec 3, 2025
| * @param sources list of source elements from the build | ||
| * @return set of non-blank module names | ||
| */ | ||
| private Set<String> extractModules(List<org.apache.maven.api.model.Source> sources) { |
Contributor
There was a problem hiding this comment.
Method could be static.
desruisseaux
reviewed
Dec 3, 2025
impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Outdated
Show resolved
Hide resolved
desruisseaux
reviewed
Dec 3, 2025
impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Outdated
Show resolved
Hide resolved
desruisseaux
reviewed
Dec 3, 2025
impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Outdated
Show resolved
Hide resolved
ascheman
force-pushed
the
feature/maven-4-resource-handling
branch
from
3e2d01f to
bef10a1
Compare
elharo
reviewed
Dec 9, 2025
impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Outdated
Show resolved
Hide resolved
impl/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
Outdated
Show resolved
Hide resolved
Maven 4.x introduces a unified <sources> element that supports modular project layouts (src/<module>/<scope>/<lang>). However, resource handling did not follow the modular layout - resources were always loaded from the legacy <resources> element which defaults to src/main/resources. This change implements automatic module-aware resource injection: - Detect modular projects (projects with at least one module in sources) - For modular projects without resource configuration in <sources>, automatically inject resource roots following the modular layout: src/<module>/main/resources and src/<module>/test/resources - Resources configured via <sources> take priority over legacy <resources> - Issue warnings (as ModelProblem) when explicit legacy resources are ignored Example: A project with modular sources for org.foo.moduleA will now automatically pick up resources from: - src/org.foo.moduleA/main/resources - src/org.foo.moduleA/test/resources This eliminates the need for explicit maven-resources-plugin executions when using modular project layouts.
- Rename hasOnlySuperPomDefaults to hasExplicitLegacyResources with inverted logic to avoid double negations in predicates - Remove redundant isEmpty() checks now handled by the method - Make extractModules method static Note: Extracting a shared method for main/test resource handling was not possible due to checkstyle ParameterNumber limit (max 7). 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
Refactor duplicate resource handling code into a shared method: - Add ResourceHandlingContext record to group shared parameters - Add handleResourceConfiguration method (4 parameters vs 9) - Remove unused outputDirectory param from createModularResourceRoot - Replace ~120 lines of duplicate code with 7 lines This addresses PR review comment apache#1 about code duplication between main and test resource handling blocks. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
- Rename 'ctx' to 'context' in DefaultProjectBuilder - Use short form 'ModelProblem' instead of FQCN in test Addresses review comments from elharo on PR apache#11505. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>
ascheman
force-pushed
the
feature/maven-4-resource-handling
branch
from
bef10a1 to
f747693
Compare
elharo
previously requested changes
Dec 13, 2025
impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Outdated
Show resolved
Hide resolved
impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Outdated
Show resolved
Hide resolved
Use {@code <element>} instead of <element> escapes in javadoc
for better readability in source code (per Martin's suggestion).
Addresses review comment from desruisseaux on PR apache#11505.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude Opus 4.5 <[email protected]>
ascheman
added a commit
to support-and-care/maven
that referenced
this pull request
Dec 14, 2025
Avoid abbreviations in new code per project conventions. Addresses review comment from elharo on PR apache#11505. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>
Avoid abbreviations in new code per project conventions. Addresses review comment from elharo on PR apache#11505. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>
ascheman
force-pushed
the
feature/maven-4-resource-handling
branch
from
bdb4c3f to
ee7f1d3
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
<sources>layoutsrc/<module>/main/resourcesandsrc/<module>/test/resources<resources>configuration is ignored in favor of modular defaultsProblem
Projects using Maven 4.x modular sources (
<source><module>org.foo.bar</module></source>) had to manually configuremaven-resources-pluginfor each module. Resources from the modular layout paths were not automatically discovered.Solution
When a project defines at least one module in
<sources>:<resources>from Super POM defaults are silently replaced<resources>configuration triggers aModelProblemwarningTest plan
testModularSourcesInjectResourceRoots- verifies resource injection for multi-module projectstestModularSourcesWithExplicitResourcesIssuesWarning- verifies warnings are issued when legacy resources are ignored