[maven] branch master updated: [MNG-7709] Regression in configuration merge (#1023)

[gnodet]

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

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
     new 116ca6a3a [MNG-7709] Regression in configuration merge (#1023)
116ca6a3a is described below

commit 116ca6a3ad52eb716baab35b52d36a5080346882
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Thu Mar 9 21:15:24 2023 +0100

    [MNG-7709] Regression in configuration merge (#1023)
---
 .../src/main/java/org/apache/maven/internal/xml/XmlNodeImpl.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlNodeImpl.java 
b/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlNodeImpl.java
index d1355d455..7dbfc8344 100644
--- 
a/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlNodeImpl.java
+++ 
b/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlNodeImpl.java
@@ -230,7 +230,7 @@ public class XmlNodeImpl implements Serializable, XmlNode {
 
             for (Map.Entry<String, String> attr : 
recessive.getAttributes().entrySet()) {
                 String key = attr.getKey();
-                if (isEmpty(dominant.getAttribute(key)) && 
!SELF_COMBINATION_MODE_ATTRIBUTE.equals(key)) {
+                if (isEmpty(dominant.getAttribute(key))) {
                     if (attrs == null) {
                         attrs = new HashMap<>();
                     }