Use request properties consistently for CI-friendly version interpolation#12177
Open
gnodet wants to merge 1 commit into
Open
Use request properties consistently for CI-friendly version interpolation#12177gnodet wants to merge 1 commit into
gnodet wants to merge 1 commit into
Conversation
…tion
The model builder inconsistently used session properties for CI-friendly
version replacement and model property merging, while model interpolation
used request properties. When user properties on the ModelBuilderRequest
differ from the Session (e.g. -Drevision=2.0.0 overriding a POM-defined
revision), ${revision} in dependency versions and distributionManagement
was not properly resolved.
Fix three places in DefaultModelBuilder to use request properties:
- getPropertiesWithProfiles(): use request system+user properties
instead of session.getEffectiveProperties()
- doReadFileModel(): use request.getUserProperties() instead of
session.getUserProperties() for model property and profile merging
Also fix DefaultConsumerPomBuilder.buildModel() to pass API Session
properties (iSession) instead of RepositorySystemSession properties
to the model builder request, ensuring consumer POM builds have
access to the full set of user properties.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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
DefaultModelBuilderthat caused${revision}to not be properly interpolated in dependency versions and distributionManagement when user properties differ between theModelBuilderRequestand theSessionDefaultConsumerPomBuilderto use API Session properties instead ofRepositorySystemSessionproperties for consumer POM model building${revision}interpolation in dependency versions with model properties, user property overrides, and user-property-only scenariosContext
The model builder used
session.getEffectiveProperties()/session.getUserProperties()for CI-friendly version replacement and model property merging, while model interpolation usedrequest.getUserProperties(). These can diverge when aModelBuilderRequestis created with custom user properties. The fix makes all property lookups use request properties consistently.Test plan
DefaultModelBuilderTest— 3 new tests for${revision}in dependency versions and distributionManagementDefaultModelBuilderTest— all 9 tests passmaven-impl— all 471 tests passmaven-core— all 546 tests pass (1 pre-existing skip)maven-compat— all 160 tests pass (7 pre-existing skips)🤖 Generated with Claude Code