Partial revert of "Support combine.self='remove'" to fix MNG-7709 by gnodet · Pull Request #241 · codehaus-plexus/plexus-utils (original) (raw)

Skip to content

Sign in

Appearance settings

View all features

View all solutions

View all resources

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Sign in

Sign up

Appearance settings

codehaus-plexus / plexus-utils Public

Additional navigation options

Merged

olamy

merged 1 commit into

codehaus-plexus:masterfrom

gnodet:fix-xml-merge

Mar 1, 2023

ConversationCommits (1)ChecksFiles changed

Merged

Partial revert of "Support combine.self='remove'" to fix MNG-7709#241

olamy

merged 1 commit into

codehaus-plexus:masterfrom

gnodet:fix-xml-merge

Conversation

@gnodet

@gnodet gnodet commented

Mar 1, 2023

edited

Loading

Copy link Copy Markdown

Member

This reverts commit 89f74c5.

jhaber reacted with thumbs up emoji

@gnodet

`[Partial revert of "Support combine.self='remove'" to fix MNG-7709](/codehaus-plexus/plexus-utils/pull/241/commits/5480608e817642da739cd2be3c68e9e9082cb91b "Partial revert of "Support combine.self='remove'" to fix MNG-7709

This reverts commit 89f74c56f4e15b0603c5e8f76cbe4b3c0a1e880a.

Conflicts:

src/test/java/org/codehaus/plexus/util/xml/Xpp3DomTest.java") `

[5480608](/codehaus-plexus/plexus-utils/pull/241/commits/5480608e817642da739cd2be3c68e9e9082cb91b)

This reverts commit 89f74c5.

Conflicts:

src/test/java/org/codehaus/plexus/util/xml/Xpp3DomTest.java

@jhaber jhaber mentioned this pull request

Mar 1, 2023

Merge behavior changed in plexus-utils 3.4.0#239

Closed

@olamy olamy added the bug label

Mar 1, 2023

@olamy olamy merged commit bf198ff into codehaus-plexus:master

Mar 1, 2023

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters

[ Show hidden characters]({{ revealButtonHref }})

Sign up for free to join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

bug

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@gnodet @olamy