[
https://issues.apache.org/jira/browse/MNG-7625?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17646709#comment-17646709
]
ASF GitHub Bot commented on MNG-7625:
-------------------------------------
gnodet commented on code in PR #909:
URL: https://github.com/apache/maven/pull/909#discussion_r1047350107
##########
maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java:
##########
@@ -51,6 +52,25 @@ public static Settings merge(Settings dominant, Settings
recessive, String reces
return new MavenSettingsMerger().merge(dominant, recessive,
recessiveSourceLevel);
}
+ /**
+ * @param dominant
+ * @param recessive
+ * @param recessiveSourceLevel
+ * @deprecated please use {@link #merge(Settings, Settings, String)}
+ */
+ @Deprecated
+ public static void merge(
+ org.apache.maven.settings.Settings dominant,
+ org.apache.maven.settings.Settings recessive,
+ String recessiveSourceLevel) {
+
+ if (dominant == null || recessive == null) {
+ return;
+ }
+
+ dominant.delegate = new SettingsMerger().merge(dominant.getDelegate(),
recessive.getDelegate(), true, null);
Review Comment:
I think it should be the same than the method above:
```new MavenSettingsMerger().merge(dominant.getDelegate(),
recessive.getDelegate(), recessiveSourceLevel)``` instead.
> Restore compatibility with Maven 3 - SettingsUtils#merge
> --------------------------------------------------------
>
> Key: MNG-7625
> URL: https://issues.apache.org/jira/browse/MNG-7625
> Project: Maven
> Issue Type: Task
> Affects Versions: 4.0.0-alpha-3
> Reporter: Slawomir Jaranowski
> Assignee: Slawomir Jaranowski
> Priority: Major
>
> Maven 3 has method:
> {code:java}
> void SettingsUtils#merge(org.apache.maven.settings.Settings,
> org.apache.maven.settings.Settings, java.lang.String)
> {code}
> It is used by {{maven-invoker-plugin}}
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
