.gitignore

@@ -1 +1 @@
-SOURCES/xmlunit-2.6.3-src.tar.gz
+SOURCES/xmlunit-1.6-src.zip

.xmlunit.metadata

@@ -1 +1 @@
-19d9c8df1d4645d59e15a27e978370964fd45030 SOURCES/xmlunit-2.6.3-src.tar.gz
+3cb4be3578fa4ad22fba2b75330f2f45563b3c94 SOURCES/xmlunit-1.6-src.zip

SOURCES/0001-Disable-tests-requiring-network-access.patch

@@ -1,146 +0,0 @@
-From 73abcb06636217e52a9d56b4dc3c69bd37141d44 Mon Sep 17 00:00:00 2001
-From: Marian Koncek <mkoncek@redhat.com>
-Date: Mon, 4 Mar 2019 14:52:59 +0100
-Subject: [PATCH 1/4] Disable tests requiring network access
-
----
- .../assertj/XmlAssertNodesByXPathTest.java    |  8 ---
- .../assertj/XmlAssertValidationTest.java      | 51 -------------------
- .../assertj/XmlAssertValueByXPathTest.java    |  8 ---
- .../matchers/ValidationMatcherTest.java       | 13 -----
- 4 files changed, 80 deletions(-)
-
-diff --git a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertNodesByXPathTest.java b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertNodesByXPathTest.java
-index 6499f67..71267c3 100644
---- a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertNodesByXPathTest.java
-+++ b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertNodesByXPathTest.java
-@@ -42,14 +42,6 @@ public class XmlAssertNodesByXPathTest {
-         assertThat(null).nodesByXPath("//foo");
-     }
- 
--    @Test
--    public void testNodesByXPath_withNull_shouldFailed() {
--
--        thrown.expectAssertionError(format("%nExpecting not blank but was:<null>"));
--
--        assertThat("<a><b></b><c/></a>").nodesByXPath(null);
--    }
--
-     @Test
-     public void testNodesByXPath_withWhitespacesOnly_shouldFailed() {
- 
-diff --git a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValidationTest.java b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValidationTest.java
-index cfa46ce..8031ede 100644
---- a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValidationTest.java
-+++ b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValidationTest.java
-@@ -82,47 +82,6 @@ public class XmlAssertValidationTest {
-         assertThat(xml).isValidAgainst(xsd);
-     }
- 
--    @Test
--    public void testIsValidAgainst_withEmptySourcesArray_shouldPass() {
--
--        StreamSource xml = new StreamSource(new File("../test-resources/BookXsdGenerated.xml"));
--
--        assertThat(xml).isValidAgainst();
--        assertThat(xml).isValidAgainst(new Object[0]);
--    }
--
--    @Test
--    public void testIsValidAgainst_withBrokenXmlAndEmptySourcesArray_shouldFailed() {
--
--        thrown.expectAssertionError("1. line=9; column=8; type=ERROR;" +
--                " message=cvc-complex-type.2.4.b: The content of element 'Book' is not complete." +
--                " One of '{\"https://www.xmlunit.org/publishing\":Publisher}' is expected.");
--
--        StreamSource xml = new StreamSource(new File("../test-resources/invalidBook.xml"));
--
--        assertThat(xml).isValidAgainst();
--    }
--
--    @Test
--    public void testIsValid_shouldPass() {
--
--        StreamSource xml = new StreamSource(new File("../test-resources/BookXsdGenerated.xml"));
--
--        assertThat(xml).isValid();
--    }
--
--    @Test
--    public void testIsValid_withBrokenXml_shouldPass() {
--
--        thrown.expectAssertionError("1. line=9; column=8; type=ERROR;" +
--                " message=cvc-complex-type.2.4.b: The content of element 'Book' is not complete." +
--                " One of '{\"https://www.xmlunit.org/publishing\":Publisher}' is expected.");
--
--        StreamSource xml = new StreamSource(new File("../test-resources/invalidBook.xml"));
--
--        assertThat(xml).isValid();
--    }
--
-     @Test
-     public void testIsInvalid_withBrokenXml_shouldPass() {
- 
-@@ -131,16 +90,6 @@ public class XmlAssertValidationTest {
-         assertThat(xml).isInvalid();
-     }
- 
--    @Test
--    public void testIsInvalid_shouldField() {
--
--        thrown.expectAssertionErrorPattern("^\\nExpecting:\\n <.*\\.\\.\\/test-resources\\/BookXsdGenerated.xml>\\nto be invalid");
--
--        StreamSource xml = new StreamSource(new File("../test-resources/BookXsdGenerated.xml"));
--
--        assertThat(xml).isInvalid();
--    }
--
-     @Test
-     public void testIsValidAgainst_withNullSchemaSources_shouldFailed() {
- 
-diff --git a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValueByXPathTest.java b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValueByXPathTest.java
-index 4aaf96b..d3a9cdd 100644
---- a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValueByXPathTest.java
-+++ b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValueByXPathTest.java
-@@ -25,14 +25,6 @@ public class XmlAssertValueByXPathTest {
-     @Rule
-     public ExpectedException thrown = none();
- 
--    @Test
--    public void testValueByXPath_withNull_shouldFailed() {
--
--        thrown.expectAssertionError(format("%nExpecting not blank but was:<null>"));
--
--        assertThat("<a><b></b><c/></a>").valueByXPath(null);
--    }
--
-     @Test
-     public void testValueByXPath_withWhitespacesOnly_shouldFailed() {
- 
-diff --git a/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java b/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java
-index 793e26a..eb4e9fa 100644
---- a/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java
-+++ b/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java
-@@ -76,19 +76,6 @@ public class ValidationMatcherTest {
-                    is(valid(new StreamSource(new File("../test-resources/Book.xsd")))));
-     }
- 
--    @Test
--    public void shouldSuccessfullyValidateInstanceWithoutExplicitSchemaSource() {
--        try {
--            Class.forName("java.nio.file.FileSystem");
--        } catch (Throwable t) {
--            assumeTrue("Skipping on Java6 as it doesn't like xmlunit.org's certificate",
--                       false);
--        }
--        assertThat(new StreamSource(new File("../test-resources/BookXsdGenerated.xml")),
--                   is(new ValidationMatcher()));
--
--    }
--
-     @Test(expected = AssertionError.class)
-     public void shouldThrowOnBrokenInstanceWithoutExplicitSchemaSource() {
-         assertThat(new StreamSource(new File("../test-resources/invalidBook.xml")),
--- 
-2.21.0
-

SOURCES/0002-Port-to-hamcrest-2.1.patch

@@ -1,156 +0,0 @@
-From c81eb91d7b9aa9728dfc83d68a881b4e2a0fa8d2 Mon Sep 17 00:00:00 2001
-From: Marian Koncek <mkoncek@redhat.com>
-Date: Thu, 29 Aug 2019 13:58:24 +0200
-Subject: [PATCH 2/4] Port to hamcrest 2.1
-
----
- .../src/main/java/org/xmlunit/matchers/CompareMatcher.java   | 3 ---
- .../main/java/org/xmlunit/matchers/EvaluateXPathMatcher.java | 2 --
- .../src/main/java/org/xmlunit/matchers/HasXPathMatcher.java  | 2 --
- .../src/main/java/org/xmlunit/matchers/TypeMatcher.java      | 5 -----
- .../main/java/org/xmlunit/matchers/ValidationMatcher.java    | 3 ---
- 5 files changed, 15 deletions(-)
-
-diff --git a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/CompareMatcher.java b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/CompareMatcher.java
-index 6452081..226399c 100644
---- a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/CompareMatcher.java
-+++ b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/CompareMatcher.java
-@@ -33,7 +33,6 @@ import org.xmlunit.util.Predicate;
- 
- import org.hamcrest.BaseMatcher;
- import org.hamcrest.Description;
--import org.hamcrest.Factory;
- import org.hamcrest.Matcher;
- 
- import java.lang.reflect.Constructor;
-@@ -112,7 +111,6 @@ public final class CompareMatcher extends BaseMatcher<Object>
-      * <p>
-      * As input all types are supported which are supported by {@link Input#from(Object)}.
-      */
--    @Factory
-     public static CompareMatcher isIdenticalTo(final Object control) {
-         return new CompareMatcher(control).checkForIdentical();
-     }
-@@ -128,7 +126,6 @@ public final class CompareMatcher extends BaseMatcher<Object>
-      * <p>
-      * As input all types are supported which are supported by {@link Input#from(Object)}.
-      */
--    @Factory
-     public static CompareMatcher isSimilarTo(final Object control) {
-         return new CompareMatcher(control).checkForSimilar();
-     }
-diff --git a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/EvaluateXPathMatcher.java b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/EvaluateXPathMatcher.java
-index 6eb23e5..1e9b8b5 100644
---- a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/EvaluateXPathMatcher.java
-+++ b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/EvaluateXPathMatcher.java
-@@ -16,7 +16,6 @@ package org.xmlunit.matchers;
- 
- import org.hamcrest.BaseMatcher;
- import org.hamcrest.Description;
--import org.hamcrest.Factory;
- import org.hamcrest.Matcher;
- import org.w3c.dom.Node;
- import org.xmlunit.builder.Input;
-@@ -93,7 +92,6 @@ public class EvaluateXPathMatcher extends BaseMatcher<Object> {
-      * @param valueMatcher matcher for the value at the specified xpath
-      * @return the xpath matcher
-      */
--    @Factory
-     public static EvaluateXPathMatcher hasXPath(String xPath, Matcher<String> valueMatcher) {
-         return new EvaluateXPathMatcher(xPath, valueMatcher);
-     }
-diff --git a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/HasXPathMatcher.java b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/HasXPathMatcher.java
-index 08325cd..6fbf0ac 100644
---- a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/HasXPathMatcher.java
-+++ b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/HasXPathMatcher.java
-@@ -16,7 +16,6 @@ package org.xmlunit.matchers;
- 
- import org.hamcrest.BaseMatcher;
- import org.hamcrest.Description;
--import org.hamcrest.Factory;
- import org.hamcrest.Matcher;
- import org.w3c.dom.Node;
- import org.xmlunit.builder.Input;
-@@ -135,7 +134,6 @@ public class HasXPathMatcher extends BaseMatcher<Object> {
-      * @param xPath the target xpath
-      * @return the xpath matcher
-      */
--    @Factory
-     public static HasXPathMatcher hasXPath(String xPath) {
-         return new HasXPathMatcher(xPath);
-     }
-diff --git a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/TypeMatcher.java b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/TypeMatcher.java
-index b9002a1..7cd6843 100644
---- a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/TypeMatcher.java
-+++ b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/TypeMatcher.java
-@@ -15,7 +15,6 @@
- package org.xmlunit.matchers;
- 
- import org.hamcrest.Description;
--import org.hamcrest.Factory;
- import org.hamcrest.Matcher;
- import org.hamcrest.TypeSafeMatcher;
- 
-@@ -128,7 +127,6 @@ public abstract class TypeMatcher<T> extends TypeSafeMatcher<String> {
-      * @param valueMatcher valueMatcher for the converted value
-      * @return the BigDecimal matcher
-      */
--    @Factory
-     public static TypeMatcher<BigDecimal> asBigDecimal(Matcher<? extends BigDecimal> valueMatcher) {
-         return new BigDecimalTypeMatcher(valueMatcher);
-     }
-@@ -146,7 +144,6 @@ public abstract class TypeMatcher<T> extends TypeSafeMatcher<String> {
-      * @param valueMatcher valueMatcher for the converted value
-      * @return the Double matcher
-      */
--    @Factory
-     public static TypeMatcher<Double> asDouble(Matcher<? extends Double> valueMatcher) {
-         return new DoubleTypeMatcher(valueMatcher);
-     }
-@@ -164,7 +161,6 @@ public abstract class TypeMatcher<T> extends TypeSafeMatcher<String> {
-      * @param valueMatcher valueMatcher for the converted value
-      * @return the Integer matcher
-      */
--    @Factory
-     public static TypeMatcher<Integer> asInt(Matcher<? extends Integer> valueMatcher) {
-         return new IntegerTypeMatcher(valueMatcher);
-     }
-@@ -182,7 +178,6 @@ public abstract class TypeMatcher<T> extends TypeSafeMatcher<String> {
-      * @param valueMatcher valueMatcher for the converted value
-      * @return the Boolean matcher
-      */
--    @Factory
-     public static TypeMatcher<Boolean> asBoolean(Matcher<? extends Boolean> valueMatcher) {
-         return new BooleanTypeMatcher(valueMatcher);
-     }
-diff --git a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/ValidationMatcher.java b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/ValidationMatcher.java
-index 3126349..51f58ec 100644
---- a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/ValidationMatcher.java
-+++ b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/ValidationMatcher.java
-@@ -27,7 +27,6 @@ import org.xmlunit.validation.ValidationProblem;
- import org.xmlunit.validation.ValidationResult;
- import org.hamcrest.BaseMatcher;
- import org.hamcrest.Description;
--import org.hamcrest.Factory;
- 
- import javax.xml.transform.Source;
- import javax.xml.validation.Schema;
-@@ -121,7 +120,6 @@ public class ValidationMatcher extends BaseMatcher {
-         }
-     }
- 
--    @Factory
-     public static ValidationMatcher valid(final Object schemaSource) {
-         return new ValidationMatcher(schemaSource);
-     }
-@@ -129,7 +127,6 @@ public class ValidationMatcher extends BaseMatcher {
-     /**
-      * @since XMLUnit 2.3.0
-      */
--    @Factory
-     public static ValidationMatcher valid(final Schema schema) {
-         return new ValidationMatcher(schema);
-     }
--- 
-2.21.0
-

SOURCES/0003-Fix-test-failure.patch

@@ -1,25 +0,0 @@
-From 2aa7002c9ff0d6226ff75048dd3cee15a180dd99 Mon Sep 17 00:00:00 2001
-From: Marian Koncek <mkoncek@redhat.com>
-Date: Wed, 16 Oct 2019 09:32:19 +0200
-Subject: [PATCH 3/4] Fix test failure
-
----
- .../src/test/java/org/xmlunit/assertj/ValueAssertTest.java      | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/ValueAssertTest.java b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/ValueAssertTest.java
-index d1e3545..5078360 100644
---- a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/ValueAssertTest.java
-+++ b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/ValueAssertTest.java
-@@ -224,7 +224,7 @@ public class ValueAssertTest {
-     @Test
-     public void testIsEqualTo_withAttributeValueExpression_shouldFailed() {
- 
--        thrown.expectAssertionError("expected:<\"[something]\"> but was:<\"[abc]\">");
-+        thrown.expectAssertionError("Expecting:\n <\"abc\">\nto be equal to:\n <\"something\">\nbut was not.");
- 
-         String xml = "<a><b attr=\"abc\"></b></a>";
- 
--- 
-2.21.0
-

SOURCES/0004-Drop-support-for-JAXB.patch

@@ -1,60 +0,0 @@
-From 9866f331db726db0ac6af64649c308b01b34ea56 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Tue, 5 Nov 2019 12:14:08 +0100
-Subject: [PATCH 4/4] Drop support for JAXB
-
----
- xmlunit-core/src/main/java/org/xmlunit/builder/Input.java  | 4 ++--
- .../src/test/java/org/xmlunit/builder/InputTest.java       | 7 -------
- 2 files changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/xmlunit-core/src/main/java/org/xmlunit/builder/Input.java b/xmlunit-core/src/main/java/org/xmlunit/builder/Input.java
-index 5321ff7..2b13cac 100644
---- a/xmlunit-core/src/main/java/org/xmlunit/builder/Input.java
-+++ b/xmlunit-core/src/main/java/org/xmlunit/builder/Input.java
-@@ -150,8 +150,8 @@ public class Input {
-     /**
-      * Build a Source from a Jaxb-Object.
-      */
--    public static JaxbBuilder fromJaxb(Object jaxbObject) {
--        return new JaxbBuilder(jaxbObject);
-+    public static Builder fromJaxb(Object jaxbObject) {
-+        throw new RuntimeException("This implementation has JAXB support removed");
-     }
- 
-     /**
-diff --git a/xmlunit-core/src/test/java/org/xmlunit/builder/InputTest.java b/xmlunit-core/src/test/java/org/xmlunit/builder/InputTest.java
-index 83ff38a..fac270d 100644
---- a/xmlunit-core/src/test/java/org/xmlunit/builder/InputTest.java
-+++ b/xmlunit-core/src/test/java/org/xmlunit/builder/InputTest.java
-@@ -31,7 +31,6 @@ import org.w3c.dom.Document;
- import org.xmlunit.NullNode;
- import org.xmlunit.TestResources;
- import org.xmlunit.XMLUnitException;
--import org.xmlunit.builder.jaxb.ComplexNode;
- import org.xmlunit.util.Convert;
- import org.xmlunit.xpath.JAXPXPathEngine;
- 
-@@ -148,10 +147,6 @@ public class InputTest {
-         allIsWellFor(s, "furry");
-     }
- 
--    @Test public void shouldParseJaxbObject() throws Exception {
--        allIsWellFor(Input.fromJaxb(new ComplexNode()).build(), "complexNode");
--    }
--
-     @Test public void shouldParseUnknownToSource() throws Exception {
-         // from Source
-         allIsWellFor(Input.from(Input.fromByteArray(readTestFile()).build()).build());
-@@ -169,8 +164,6 @@ public class InputTest {
-         allIsWellFor(Input.from(new URI("file:" + TestResources.ANIMAL_FILE)).build());
-         // from URL
-         allIsWellFor(Input.from(new URL("file:" + TestResources.ANIMAL_FILE)).build());
--        // from Jaxb-Object
--        allIsWellFor(Input.from(new ComplexNode()).build(), "complexNode");
-         // from InputStream
-         FileInputStream is = null;
-         try {
--- 
-2.21.0
-

SOURCES/xmlunit-1.0.pom

@@ -0,0 +1,6 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>xmlunit</groupId>
+  <artifactId>xmlunit</artifactId>
+  <version>1.0</version>
+</project>

SPECS/xmlunit.spec

@@ -1,32 +1,61 @@
+# Copyright (c) 2000-2007, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
 Name:           xmlunit
-Version:        2.6.3
+Version:        1.6
-Release:        2%{?dist}
+Release:        7%{?dist}
+Epoch:          0
 Summary:        Provides classes to do asserts on xml
-# The whole package is ASL 2.0 except for xmlunit-legacy which is BSD
+License:        BSD
-License:        ASL 2.0 and BSD
+Source0:        http://downloads.sourceforge.net/xmlunit/xmlunit-1.6-src.zip
-Source0:        https://github.com/xmlunit/xmlunit/releases/download/v%{version}/%{name}-%{version}-src.tar.gz
+Source1:        http://repo1.maven.org/maven2/xmlunit/xmlunit/1.0/xmlunit-1.0.pom
-URL:            https://www.xmlunit.org/
+URL:            http://xmlunit.sourceforge.net/
+BuildRequires:  javapackages-local
+BuildRequires:  ant
+BuildRequires:  ant-junit
+BuildRequires:  junit
+BuildRequires:  xalan-j2
+BuildRequires:  xerces-j2
+BuildRequires:  xml-commons-apis
 
-Patch1:         0001-Disable-tests-requiring-network-access.patch
+Requires:       junit
-Patch2:         0002-Port-to-hamcrest-2.1.patch
+Requires:       xalan-j2
-Patch3:         0003-Fix-test-failure.patch
+Requires:       xml-commons-apis
-Patch4:         0004-Drop-support-for-JAXB.patch
-
-BuildRequires:  maven-local
-BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-shade-plugin)
-BuildRequires:  mvn(org.assertj:assertj-core)
-BuildRequires:  mvn(org.hamcrest:hamcrest-core)
-BuildRequires:  mvn(org.hamcrest:hamcrest-library)
-BuildRequires:  mvn(org.mockito:mockito-core)
 
 BuildArch:      noarch
 
 %description
-XMLUnit provides you with the tools to verify the XML you emit is the one you
+XMLUnit extends JUnit to simplify unit testing of XML. It compares a control
-want to create. It provides helpers to validate against an XML Schema, assert
+XML document to a test document or the result of a transformation, validates
-the values of XPath queries or compare XML documents against expected outcomes.
+documents against a DTD, and (from v0.5) compares the results of XPath
+expressions.
 
 %package        javadoc
 Summary:        Javadoc for %{name}
@@ -34,93 +63,41 @@ Summary:        Javadoc for %{name}
 %description    javadoc
 Javadoc for %{name}
 
-%package        assertj
-Summary:        Assertj for %{name}
-
-%description    assertj
-This package provides %{summary}.
-
-%package        core
-Summary:        Core package for %{name}
-
-%description    core
-This package provides %{summary}.
-
-%package        legacy
-Summary:        Legacy package for %{name}
-
-%description    legacy
-This package provides %{summary}.
-
-%package        matchers
-Summary:        Matchers for %{name}
-
-%description    matchers
-This package provides %{summary}.
-
-%package        placeholders
-Summary:        Placeholders for %{name}
-
-%description    placeholders
-This package provides %{summary}.
-
 %prep
-%setup -q -n %{name}-%{version}-src
+%setup -q
 
-%patch1 -p1
+sed -i /java.class.path/d build.xml
-%patch2 -p1
+# remove all binary libs and javadocs
-# This test failure showed up after updating mockito to 3.X, but the error
+find . -name "*.jar" -exec rm -f {} \;
-# message clearly points to assertj-core
+rm -rf doc
-%patch3 -p1
-%patch4 -p1
 
-%pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin
+#Fix wrong-file-end-of-line-encoding
-%pom_remove_plugin :maven-assembly-plugin
+sed -i 's/\r//g' README.txt LICENSE.txt
 
-%mvn_alias "org.xmlunit:xmlunit-legacy" "xmlunit:xmlunit"
+%mvn_file : %{name}
-
-# JAXB and JAF are not available in JDK11
-%pom_remove_dep javax.activation:* xmlunit-core
-%pom_remove_dep javax.xml.bind:* xmlunit-core
-%pom_remove_dep com.sun.xml.bind:* xmlunit-core
-rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder.java,JaxbBuilderTest.java}
 
 %build
-%mvn_build -s
+ant -Dbuild.compiler=modern -Dhaltonfailure=yes \
+    -Djunit.lib=$(build-classpath junit) \
+    -Dxmlxsl.lib= -Dtest.report.dir=test \
+    -Ddb5.xsl=%{_datadir}/sgml/docbook/xsl-ns-stylesheets \
+    jar javadocs
+
+%mvn_artifact %{SOURCE1} build/lib/%{name}-%{version}.jar
 
 %install
-%mvn_install
+%mvn_install -J build/doc/api/
 
-%files -f .mfiles-xmlunit-parent
+%check
-%doc README.md CONTRIBUTING.md RELEASE_NOTES.md
+ant
-%license LICENSE
+
+
+%files -f .mfiles
+%doc README.txt LICENSE.txt userguide/XMLUnit-Java.pdf
 
 %files javadoc -f .mfiles-javadoc
-%files assertj -f .mfiles-xmlunit-assertj
-%files core -f .mfiles-xmlunit-core
-%files legacy -f .mfiles-xmlunit-legacy
-%files matchers -f .mfiles-xmlunit-matchers
-%files placeholders -f .mfiles-xmlunit-placeholders
 
 %changelog
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.3-2
-- Mass rebuild for javapackages-tools 201902
-
-* Wed Jun 26 2019 Marian Koncek <mkoncek@redhat.com> - 2.6.3-1
-- Update to upstream version 2.6.3
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.2-2
-- Mass rebuild for javapackages-tools 201901
-
-* Mon Mar 04 2019 Marian Koncek <mkoncek@redhat.com> - 0:2.6.2-1
-- Update to upstream version 2.6.2
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.6-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.6-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.6-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild