gnodet commented on PR #13112: URL: https://github.com/apache/maven/pull/13112#issuecomment-5698526395
Conflict resolved with `origin/master` (which includes #13100). **The two PRs are complementary — not contradictory.** Merged approach: - **Sandbox kept** (`withoutUserPropertiesAndFilesystem()`): user-property suppression + POM-declared property activation remain intact. - **Repo stripping removed** (per #13100): repositories from legitimately-active external profiles (JDK/OS/activeByDefault and POM-property-gated) are now honored, fixing the `project → dep1 → dep2` pattern. - **Test reconciliation**: `testExternalModelProfileRepositoriesAreAlwaysStripped` renamed to `testExternalModelJdkProfileRepositoriesAreHonored` with `noneMatch → anyMatch`; `testActiveByDefaultProfileRepositoryHonored` added from #13100; negated-property default-on assertions added to `DefaultModelBuilderTest` from `b1506fc`. All 50 tests pass (40 impl + 9 compat ExternalModelProfileActivationTest + 1 compat DefaultModelBuilderTest). -- 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]
