Skip to content

[4.0.x] Fix mvnup effective model analysis for CI-friendly parent versions#12230

Merged
gnodet merged 1 commit into
apache:maven-4.0.xfrom
gnodet:cherry-pick-12205-to-4.0.x
Jun 4, 2026
Merged

[4.0.x] Fix mvnup effective model analysis for CI-friendly parent versions#12230
gnodet merged 1 commit into
apache:maven-4.0.xfrom
gnodet:cherry-pick-12205-to-4.0.x

Conversation

@gnodet

@gnodet gnodet commented Jun 4, 2026

Copy link
Copy Markdown
Contributor

Cherry-pick of #12205

…pache#12205)

* Fix mvnup effective model analysis for CI-friendly parent versions

mvnup's PluginUpgradeStrategy copied POMs to a temp directory for
effective model analysis. That temp directory lacked .mvn, so root
detection failed for child modules with ${revision} parent versions,
producing "Parent POM is located above the root directory" errors.

Eliminate the temp directory entirely — build effective models from
the original file paths, which already have proper .mvn and project
structure for root detection.

Also fix DefaultModelBuilder.doReadFileModel() to:
- Enter the parent resolution block when parent version contains
  expressions (${revision}, etc.)
- Only enforce isParentWithinRootDirectory when rootDirectory came
  from the session, not the fallback heuristic
- Accept parent version match when version contains an expression

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* Fix Spotless formatting violation

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
@gnodet gnodet merged commit 2941bf3 into apache:maven-4.0.x Jun 4, 2026
@github-actions github-actions Bot added this to the 4.0.0-rc-6 milestone Jun 4, 2026
@github-actions

github-actions Bot commented Jun 4, 2026

Copy link
Copy Markdown

@gnodet Please assign appropriate label to PR according to the type of change.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant