Unify source tracking with SourceHandlingContext (#11612) #11632

ascheman · 2026-01-07T17:46:07Z

Summary

Replace boolean flags (hasMain, hasTest, hasMainResources, etc.) with flexible set-based tracking using SourceHandlingContext
Rename ResourceHandlingContext to SourceHandlingContext to reflect unified handling of all source types
Add duplicate detection: first enabled source wins, duplicates trigger WARNING
Add hasSources(Language, ProjectScope) method for checking source existence
Replace Collectors.toList() with .toList() (Java 17+ idiom)

Closes #11612 (Phase 2: build-sources-validation)

Test plan

ProjectBuilderTest passes (19 tests)
New tests added:
- testModularSourcesInjectResourceRoots - verifies module-aware resource injection
- testModularSourcesWithExplicitResourcesIssuesWarning - verifies legacy resource warnings
- testMixedSourcesModularMainClassicTest - mixed modular/classic configuration
- testSourcesMixedModulesWithinSources - mixed modules within <sources>
- testMultipleDirectoriesSameModule - multiple directories per module
- testDuplicateEnabledSources - duplicate detection with WARNING

🤖 Generated with Claude Code

desruisseaux · 2026-01-10T11:44:24Z

impl/maven-core/src/main/java/org/apache/maven/project/SourceHandlingContext.java

    private final Set<String> modules;
    private final boolean modularProject;
    private final ModelBuilderResult result;
+    private final Set<SourceKey> declaredSources = new HashSet<>();


It is a very minor details, but moving this initialization inside the constructor would allow to specify an initial capacity as new HashSet<>(4 * modules.size()) (assuming that each module is likely to have a main, a test, main resources and test resources).

Done in commit 63d43d5. Moved initialization to constructor with initial capacity.

desruisseaux · 2026-01-10T11:52:00Z

impl/maven-core/src/main/java/org/apache/maven/project/SourceHandlingContext.java

+    boolean shouldAddSource(SourceRoot sourceRoot) {
+        if (!sourceRoot.enabled()) {
+            // Disabled sources are always added - they're filtered out by getEnabledSourceRoots()
+            LOGGER.debug(


Should this one be at the trace level?

Done in commit 63d43d5. Changed from DEBUG to TRACE level.

desruisseaux · 2026-01-10T11:55:33Z

impl/maven-core/src/main/java/org/apache/maven/project/SourceHandlingContext.java

+        }
+
+        SourceKey key = new SourceKey(
+                sourceRoot.language(), sourceRoot.scope(), sourceRoot.module().orElse(null), sourceRoot.directory());


We may consider adding .toRealPath() after directory() for making the test more exhaustive.

Used .toAbsolutePath().normalize() instead in commit 63d43d5.

toRealPath() requires the file to exist on the filesystem and throws IOException if it doesn't, which would break duplicate detection for source directories that don't exist yet. The normalize() approach handles relative paths and .. components without requiring filesystem access.

impl/maven-core/src/main/java/org/apache/maven/project/SourceHandlingContext.java

desruisseaux · 2026-01-10T12:18:41Z

impl/maven-core/src/test/projects/project-builder/mixed-sources/pom.xml

+                <lang>java</lang>
+                <module>org.foo.moduleB</module>
+            </source>
+            <!-- No test sources defined - testSourceDirectory should be used -->


This is ambiguous: how could a single testSourceDirectory be used for two modules? I suggest to allow <sourceDirectory> and <testSourceDirectory> only for non-modular projects, and emit a warning or error for modular projects.

Implemented in commit 63d43d5 as AC7: In modular projects, <sourceDirectory> and <testSourceDirectory> are now unconditionally ignored with a WARNING.

The test has been updated to verify this behavior - both legacy directories trigger warnings and are not used.

desruisseaux · 2026-01-10T12:21:56Z

impl/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java

+    /**
+     * Tests mixed source configuration where:
+     * - Modular sources are defined for main Java (should override sourceDirectory)
+     * - Classic testSourceDirectory is used (should be preserved since no modular test sources)


See comment in mixed-sources: this is ambiguous if we have more than one module. I suggest to modify the test for verifying that <testSourceDirectory> has been ignored and a warning emitted.

Instead (maybe in a phase 3), for each module declared in a <source> with main scope but no test scope, generate automatically the <source> with test scope in a way similar to what is currently done for resources.

Done in commit 63d43d5. The test testMixedSourcesModularMainClassicTest() now verifies:

2 warnings are emitted (one for <sourceDirectory>, one for <testSourceDirectory>)

Test sources are NOT added (0 test Java roots) because legacy <testSourceDirectory> is ignored

desruisseaux · 2026-01-10T12:23:45Z

impl/maven-core/src/test/projects/project-builder/sources-mixed-modules/pom.xml

+                <lang>java</lang>
+                <module>org.foo.moduleA</module>
+            </source>
+            <!-- Non-modular source (no module attribute) -->


Should not be allowed. Either a project is fully modular or fully classic, but not a mix of both. The compiler plugin will not be able to handle that.

Implemented in commit 63d43d5 as AC6: Mixing modular (with module attribute) and classic (without module attribute) sources within <sources> now triggers an ERROR.

The test project comments and test method have been updated accordingly.

desruisseaux · 2026-01-10T12:25:44Z

impl/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java

+    }
+
+    /**
+     * Tests mixed modular/non-modular sources within the same {@code <sources>} element.


See comment in sources-mixed-modules: a project can be fully modular or fully classic, but not a mix of both. An error should be emitted. In this case, I think that it should be an error rather than a warning, because the compiler plugin will not know what to do with such mixed project.

Done in commit 63d43d5. The validateNoMixedModularAndClassicSources() method now reports an ERROR (not a warning) for mixed configurations, as suggested.

The test testSourcesMixedModulesWithinSources() verifies that an ERROR is reported with the message "Mixed modular and classic sources detected".

Replace boolean flags (hasMain, hasTest, etc.) with flexible set-based tracking for all language/scope combinations. - Rename ResourceHandlingContext to SourceHandlingContext - Add duplicate detection with WARNING for enabled sources - Add hasSources() method for checking language/scope combinations - Rename 'src' variable to 'sourceRoot' for clarity 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Use Java 17+ Stream.toList() instead of Collectors.toList(). 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Normalize path separators to forward slashes before comparing directory paths in tests. On Windows, Path.toString() returns backslashes, causing contains() checks with forward slashes to fail. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Implement validation rules for modular source handling (apache#11612): - AC6: ERROR when mixing modular (with module) and classic (without module) sources within <sources> - AC7: WARNING when legacy <sourceDirectory>/<testSourceDirectory> are used in modular projects (both explicit config and filesystem existence) Changes: - Add validateNoMixedModularAndClassicSources() to SourceHandlingContext - Add warnIfExplicitLegacyDirectory() to DefaultProjectBuilder - Update tests to verify AC6 and AC7 behavior - Update test project comments to reflect correct behavior Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

This was referenced Jan 7, 2026

Track Maven Core 11632 (phase 2 of module aware resources handling) support-and-care/maven-support-and-care#159

Open

Extend Maven Core by full-blown sources-handling support-and-care/maven-support-and-care#148

Closed

desruisseaux self-assigned this Jan 10, 2026

desruisseaux added the enhancement New feature or request label Jan 10, 2026

desruisseaux reviewed Jan 10, 2026

View reviewed changes

impl/maven-core/src/main/java/org/apache/maven/project/SourceHandlingContext.java Show resolved Hide resolved

desruisseaux reviewed Jan 10, 2026

View reviewed changes

impl/maven-core/src/main/java/org/apache/maven/project/SourceHandlingContext.java Show resolved Hide resolved

desruisseaux reviewed Jan 10, 2026

View reviewed changes

ascheman and others added 4 commits January 13, 2026 20:43

Replace Collectors.toList() with .toList() in DefaultProjectBuilder

057d59a

Use Java 17+ Stream.toList() instead of Collectors.toList(). 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

ascheman force-pushed the feature/11612-source-handling-context branch from 159d2ae to 63d43d5 Compare January 13, 2026 21:14

Unify source tracking with SourceHandlingContext (#11612) #11632

Are you sure you want to change the base?

Unify source tracking with SourceHandlingContext (#11612) #11632

Uh oh!

Conversation

ascheman commented Jan 7, 2026

Summary

Test plan

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants