You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/12/13 08:13:50 UTC
[maven] 01/01: [MNG-7625] Restore compatibility with Maven 3 - SettingsUtils#merge
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MNG-7625
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 3e2fded6ea0af6a869dc99b2fa7f9decc8b0c95b
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Tue Dec 13 09:13:17 2022 +0100
[MNG-7625] Restore compatibility with Maven 3 - SettingsUtils#merge
---
.../org/apache/maven/settings/SettingsUtils.java | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java b/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java
index f60f83b41..bba30d7d2 100644
--- a/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java
@@ -30,6 +30,7 @@ import org.apache.maven.api.settings.Repository;
import org.apache.maven.api.settings.RepositoryPolicy;
import org.apache.maven.api.settings.Settings;
import org.apache.maven.settings.merge.MavenSettingsMerger;
+import org.apache.maven.settings.v4.SettingsMerger;
/**
* Several convenience methods to handle settings
@@ -51,6 +52,25 @@ public final class SettingsUtils {
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);
+ }
+
/**
* @param modelProfile
* @return a profile