Use request properties consistently for CI-friendly version interpolation#12184
Merged
gnodet merged 1 commit intoJun 4, 2026
Merged
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>
5 tasks
rmannibucau
approved these changes
Jun 2, 2026
Bukama
approved these changes
Jun 4, 2026
|
@gnodet Please assign appropriate label to PR according to the type of change. |
This was referenced Jun 4, 2026
gnodet
added a commit
that referenced
this pull request
Jun 4, 2026
…tion (#12184) (#12227) 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
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
${revision},${changelist},${sha1})${revision}to remain unresolved when user properties differ from the sessiongetPropertiesWithProfiles(),doReadFileModel(), andDefaultConsumerPomBuilder.buildModel()to consistently use request propertiesTest plan
DefaultModelBuilderTestcases for CI-friendly dependency version resolution${revision}(e.g. logging-log4j-*, hbase-connectors, bigtop-manager) build correctlyClaude Code on behalf of Guillaume Nodet