You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@maven.apache.org by gn...@apache.org on 2022/12/15 08:18:40 UTC

[maven] branch feature/enforce-backwards-compat updated (487c64933 -> 8bad82e6e)

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a change to branch feature/enforce-backwards-compat
in repository https://gitbox.apache.org/repos/asf/maven.git


    from 487c64933 Merge remote-tracking branch 'origin/master' into feature/enforce-backwards-compat
     add 8bad82e6e Fix SettingsUtils.merge, use the SettingsMerger, deprecate MavenSettingsMerger

No new revisions were added by this update.

Summary of changes:
 .../src/main/java/org/apache/maven/settings/SettingsUtils.java    | 2 +-
 .../src/main/java/org/apache/maven/settings/SettingsUtilsV4.java  | 8 ++++----
 .../test/java/org/apache/maven/settings/SettingsUtilsTest.java    | 2 +-
 .../java/org/apache/maven/settings/merge/MavenSettingsMerger.java | 2 ++
 4 files changed, 8 insertions(+), 6 deletions(-)