This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
commit aeb788a3166db2b20a19be4f259524bba1bcb325 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Sat Oct 31 09:58:14 2026 +0000 Drop JUnit 4 and the vintage engine from the tests xmlunit-legacy brings junit 3.8.1, and surefire adds the vintage engine whenever JUnit is on the test classpath, so ComponentsXmlResourceTransformerTest uses xmlunit-core instead. --- pom.xml | 28 +--------------------- .../ComponentsXmlResourceTransformerTest.java | 20 +++++++++------- 2 files changed, 12 insertions(+), 36 deletions(-) diff --git a/pom.xml b/pom.xml index 8301e3aa..d952920c 100644 --- a/pom.xml +++ b/pom.xml @@ -87,21 +87,6 @@ <project.build.outputTimestamp>2026-03-02T10:52:20Z</project.build.outputTimestamp> </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.13.2</version> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> - <version>3.0</version> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <!-- Needed dependencies --> <dependency> @@ -215,17 +200,6 @@ <artifactId>org.eclipse.sisu.plexus</artifactId> <scope>test</scope> </dependency> - <!-- Used by: ShadeMojoTest, which extends AbstractMojoTestCase (JUnit 3 TestCase) --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-api</artifactId> @@ -233,7 +207,7 @@ </dependency> <dependency> <groupId>org.xmlunit</groupId> - <artifactId>xmlunit-legacy</artifactId> + <artifactId>xmlunit-core</artifactId> <version>2.14.0</version> <scope>test</scope> </dependency> diff --git a/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java b/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java index 116df161..62b9596b 100644 --- a/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java +++ b/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java @@ -23,11 +23,12 @@ import java.util.Collections; import org.apache.maven.plugins.shade.relocation.Relocator; import org.codehaus.plexus.util.IOUtil; -import org.custommonkey.xmlunit.Diff; -import org.custommonkey.xmlunit.XMLAssert; -import org.custommonkey.xmlunit.XMLUnit; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.xmlunit.builder.DiffBuilder; +import org.xmlunit.diff.Diff; + +import static org.junit.jupiter.api.Assertions.assertFalse; /** * Test for {@link ComponentsXmlResourceTransformer}. @@ -46,8 +47,6 @@ public class ComponentsXmlResourceTransformerTest { @Test public void testConfigurationMerging() throws Exception { - XMLUnit.setNormalizeWhitespace(true); - InputStream resourceAsStream = getClass().getResourceAsStream("/components-1.xml"); transformer.processResource("components-1.xml", resourceAsStream, Collections.<Relocator>emptyList(), 0); resourceAsStream.close(); @@ -55,12 +54,15 @@ public class ComponentsXmlResourceTransformerTest { transformer.processResource("components-1.xml", resourceAsStream1, Collections.<Relocator>emptyList(), 0); resourceAsStream1.close(); final InputStream resourceAsStream2 = getClass().getResourceAsStream("/components-expected.xml"); - Diff diff = XMLUnit.compareXML( - IOUtil.toString(resourceAsStream2, "UTF-8"), - IOUtil.toString(transformer.getTransformedResource(), "UTF-8")); + Diff diff = DiffBuilder.compare(IOUtil.toString(resourceAsStream2, "UTF-8")) + .withTest(IOUtil.toString(transformer.getTransformedResource(), "UTF-8")) + .ignoreComments() + .normalizeWhitespace() + .checkForIdentical() + .build(); // assertEquals( IOUtil.toString( getClass().getResourceAsStream( "/components-expected.xml" ), "UTF-8" ), // IOUtil.toString( transformer.getTransformedResource(), "UTF-8" ).replaceAll("\r\n", "\n") ); resourceAsStream2.close(); - XMLAssert.assertXMLIdentical(diff, true); + assertFalse(diff.hasDifferences(), diff.toString()); } }
