Skip to content

Commit

Permalink
Partial revert of "Support combine.self='remove'" to fix MNG-7709 (#241)
Browse files Browse the repository at this point in the history
This reverts commit 89f74c5.

# Conflicts:
#	src/test/java/org/codehaus/plexus/util/xml/Xpp3DomTest.java
  • Loading branch information
gnodet authored Mar 1, 2023
1 parent 32b72a6 commit bf198ff
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) );
}
Expand Down

0 comments on commit bf198ff

Please sign in to comment.