From bf198ff5d8f3bd5eb90d09826006c4d419884660 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 1 Mar 2023 23:03:13 +0100 Subject: [PATCH] Partial revert of "Support combine.self='remove'" to fix MNG-7709 (#241) This reverts commit 89f74c56f4e15b0603c5e8f76cbe4b3c0a1e880a. # Conflicts: # src/test/java/org/codehaus/plexus/util/xml/Xpp3DomTest.java --- src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java b/src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java index 4f268f9d..f6e46b46 100644 --- a/src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java +++ b/src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java @@ -445,7 +445,7 @@ private static void mergeIntoXpp3Dom( Xpp3Dom dominant, Xpp3Dom recessive, Boole { for ( String attr : recessive.attributes.keySet() ) { - if ( isEmpty( dominant.getAttribute( attr ) ) && !SELF_COMBINATION_MODE_ATTRIBUTE.equals( attr ) ) + if ( isEmpty( dominant.getAttribute( attr ) ) ) { dominant.setAttribute( attr, recessive.getAttribute( attr ) ); }