gnodet commented on PR #1774:
URL: https://github.com/apache/maven/pull/1774#issuecomment-5803623165
Rebased onto current \`master\` (as of 2026-09-23).
Conflicts resolved during rebase:
- Infra/tooling files (lifecycle plugin versions, IT test signatures,
`pom.xml` changes): took master's version — the PR's base was ~3 months old
- Feature files (`ProfileActivationContext`,
`DefaultProfileActivationContext`, `DefaultProfileSelector`,
`PropertyProfileActivator`, `ConditionProfileActivator`,
`DefaultProfileSelectorTest`): auto-merged cleanly
- Minor adaptations needed post-rebase:
- Added `addProfileProperties()` no-op to the sandboxed anonymous
`ProfileActivationContext` in `withoutUserPropertiesAndFilesystem()`
- Updated `DefaultProfileSelectorTest` constructor calls
(`DefaultPathTranslator` was made package-private on master)
- Updated `ConditionParserTest` to pass `null` as the first arg to
`property()` (matching the new 3-arg signature)
- Restored `DefaultModelPathTranslator` to not align `targetPath` to
basedir (master added that invariant + test for it)
- Added `addProfileProperties()` no-op to `ExecutableFinderTest`'s
anonymous context
Full `mvn clean verify -B -DskipITs` passes locally.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
