gnodet opened a new pull request, #13992:
URL: https://github.com/apache/maven/pull/13992
Backport of #13537 to `maven-4.0.x`.
## Changes
- **`MavenSettingsMerger#shallowMergeById`**: append recessive elements to
dominant
instead of prepending at index 0, so user (dominant) mirrors precede global
(recessive) mirrors. Fixes the core issue: the
`maven-default-http-blocker` from
global settings would take precedence over user-defined mirrors for
insecure repos.
- **`DefaultSettingsBuilder.SETTINGS_MERGER`**: promoted to `static final`,
added
`getMirrorKey`, `getServerKey`, `getProxyKey`, `getProfileKey` overrides
that key all
`IdentifiableBase` elements by id (not by object identity).
- **`SettingsUtilsV4.merge`**: use `SETTINGS_MERGER` with
`sourceDominant=false` so
dominant settings values override recessive ones; remove stale
`SettingsMerger` import.
- **Tests**: add `MavenSettingsMergerTest` (new); extend `SettingsUtilsTest`
and
`DefaultSettingsBuilderFactoryTest` with mirror-ordering and precedence
coverage.
Equivalent of merge commit 7bfe05bc609eb7703b2a18133f5a22340a0e3d2a.
<!-- maven-backport-bot -->
--
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]