[#12303] Fix CI-friendly ${revision} not interpolated for non-build POM reads

[gnodet]

Summary

Fixes the ${revision} CI-friendly version placeholder not being interpolated when Maven reads dependency or parent POMs outside of a build request (e.g. when the maven-remote-resources-plugin resolves the project's own POM).

• In DefaultModelBuilder.doReadFileModel(), the CI-friendly version interpolation for non-build requests was guarded by else if (modelSource.getPath() != null). Since ResolvedPathSource.getPath() always returns null, the replaceCiFriendlyVersion() call was dead code.
• Changed to an unconditional else block so getEnhancedProperties() and replaceCiFriendlyVersion() always run for non-build requests.
• Added IT that exercises the fix with a dependency whose parent POM uses ${revision} in its version.

Verified against the original use case (bigtop-manager project from #12303): without the fix, process-resources fails with Invalid Version Range Request: ...pom:${revision}; with the fix, the version resolves correctly to 1.2.0-SNAPSHOT.

Fixes #12303

Test plan

• IT MavenITgh12303CIFriendlyRevisionRemoteResourcesTest passes
• RED/GREEN verified: IT fails without fix, passes with fix
• Verified against original bigtop-manager use case from CI-friendly ${revision} not interpolated when used by maven-remote-resources-plugin #12303
• Existing CI-friendly version tests still pass
• No regressions in model builder behavior for build requests

Claude Code on behalf of Guillaume Nodet

[Copilot]

Pull request overview

Fixes Maven 4 CI-friendly version interpolation (${revision}) for POMs read via the non-build-request path (e.g., dependency/parent POM resolution triggered by plugins such as maven-remote-resources-plugin), where ModelSource.getPath() may be null (notably for ResolvedPathSource) and the interpolation code was previously unreachable.

Changes:

• Update DefaultModelBuilder.doReadFileModel() to run CI-friendly version interpolation for non-build requests regardless of modelSource.getPath() availability.
• Add a new core IT (MavenITgh12303CIFriendlyRevisionRemoteResourcesTest) plus test resources to reproduce and validate the ${revision} interpolation when resolving a POM whose parent version contains ${revision}.
• Add a small local file-based repository fixture (plus settings template) used by the IT.

Reviewed changes

Copilot reviewed 12 out of 13 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java	Makes CI-friendly version interpolation run for non-build model reads even when ModelSource.getPath() is null.
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12303CIFriendlyRevisionRemoteResourcesTest.java	New IT covering the regression scenario and verifying the fix.
its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/settings-template.xml	Test settings pointing Maven at the fixture repo for deterministic resolution.
its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/pom.xml	Parent test project using ${revision} CI-friendly version.
its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/child/pom.xml	Child module inheriting ${revision} parent version.
its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/child-b/pom.xml	Module that triggers dependency resolution involving a parent version containing ${revision}.
its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/repo/org/apache/maven/its/gh12303/ci-lib/1.0/ci-lib-1.0.pom	Fixture dependency POM whose parent version uses ${revision}.
its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/repo/org/apache/maven/its/gh12303/ci-lib-parent/1.0/ci-lib-parent-1.0.pom	Fixture parent POM defining revision property.
its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/resource-bundle/src/main/resources/NOTICE.txt	Minimal resource bundle content used by the remote-resources plugin.
its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/resource-bundle/src/main/resources/META-INF/maven/remote-resources.xml	Remote-resources bundle descriptor.
its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/resource-bundle/pom.xml	Resource bundle project POM (test fixture).
its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/repo/org/apache/maven/its/gh12303/resource-bundle/1.0/resource-bundle-1.0.pom	Pre-baked POM in the fixture repo for the resource bundle artifact.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.