diff --git a/0001-Port-to-Xmlunit-2.6.2.patch b/0001-Port-to-Xmlunit-2.6.2.patch new file mode 100644 index 0000000..d72380a --- /dev/null +++ b/0001-Port-to-Xmlunit-2.6.2.patch @@ -0,0 +1,86 @@ +From 7049d71ed85851fb5ca25b88c5e33b51cf3a5dac Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Fri, 19 Apr 2019 09:32:40 +0200 +Subject: [PATCH] Port to Xmlunit 2.6.2 + +--- + xmvn-parent/pom.xml | 10 +++++----- + .../xmvn/tools/install/impl/InstallerTest.java | 6 ++---- + 2 files changed, 7 insertions(+), 9 deletions(-) + +diff --git a/xmvn-parent/pom.xml b/xmvn-parent/pom.xml +index d4f9dda..5c21cfa 100644 +--- a/xmvn-parent/pom.xml ++++ b/xmvn-parent/pom.xml +@@ -122,7 +122,7 @@ + 3.6 + 3.0.1 + 2.19.1 +- 1.6 ++ 2.6.2 + + + +@@ -228,8 +228,8 @@ + ${junitVersion} + + +- xmlunit +- xmlunit ++ org.xmlunit ++ xmlunit-assertj + ${xmlunitVersion} + + +@@ -336,8 +336,8 @@ + test + + +- xmlunit +- xmlunit ++ org.xmlunit ++ xmlunit-assertj + test + + +diff --git a/xmvn-tools/xmvn-install/src/test/java/org/fedoraproject/xmvn/tools/install/impl/InstallerTest.java b/xmvn-tools/xmvn-install/src/test/java/org/fedoraproject/xmvn/tools/install/impl/InstallerTest.java +index 9fb7d90..bece0b2 100644 +--- a/xmvn-tools/xmvn-install/src/test/java/org/fedoraproject/xmvn/tools/install/impl/InstallerTest.java ++++ b/xmvn-tools/xmvn-install/src/test/java/org/fedoraproject/xmvn/tools/install/impl/InstallerTest.java +@@ -15,8 +15,6 @@ + */ + package org.fedoraproject.xmvn.tools.install.impl; + +-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual; +-import static org.custommonkey.xmlunit.XMLUnit.setIgnoreWhitespace; + import static org.easymock.EasyMock.expect; + import static org.easymock.EasyMock.replay; + import static org.easymock.EasyMock.verify; +@@ -40,6 +38,7 @@ import org.junit.runner.RunWith; + import org.w3c.dom.Document; + import org.w3c.dom.Node; + import org.w3c.dom.NodeList; ++import org.xmlunit.assertj.XmlAssert; + + import org.fedoraproject.xmvn.artifact.DefaultArtifact; + import org.fedoraproject.xmvn.config.Artifact; +@@ -188,7 +187,6 @@ public class InstallerTest + protected void assertMetadataEqual( Path expected, Path actual ) + throws Exception + { +- setIgnoreWhitespace( true ); + assertTrue( Files.isRegularFile( actual ) ); + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + DocumentBuilder builder = factory.newDocumentBuilder(); +@@ -208,7 +206,7 @@ public class InstallerTest + unifyUuids( expectedXml.getElementsByTagName( "uuid" ) ); + unifyUuids( actualXml.getElementsByTagName( "uuid" ) ); + +- assertXMLEqual( expectedXml, actualXml ); ++ XmlAssert.assertThat( expectedXml ).and( actualXml ).ignoreWhitespace().areSimilar(); + } + + @Test +-- +2.20.1 + diff --git a/0001-test-Fix-XML-namespace-in-installer-test-resources.patch b/0001-test-Fix-XML-namespace-in-installer-test-resources.patch new file mode 100644 index 0000000..56af48f --- /dev/null +++ b/0001-test-Fix-XML-namespace-in-installer-test-resources.patch @@ -0,0 +1,311 @@ +From c35be2b2b90741aa4f7c260fa4954cd5d3c2e6a8 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Wed, 17 Apr 2019 16:12:22 +0200 +Subject: [PATCH] [test] Fix XML namespace in installer test resources + +--- + xmvn-tools/xmvn-install/src/test/resources/alias.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/compat.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/metadata-uuid.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/namespace-dep.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/namespace.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/no-aid-dep.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/no-aid-excl.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/no-aid.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/no-file.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/no-gid-dep.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/no-gid-excl.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/no-gid.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/no-version-dep.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/no-version.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/nonexistent-file.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/nonreadable-file.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/nonregular-file.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/resolved-version.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/skipped.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/test-pkg-main.xml | 2 +- + .../xmvn-install/src/test/resources/test-pkg-resolved.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/test-pkg-sub.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/test-pkg.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/uuid.xml | 2 +- + xmvn-tools/xmvn-install/src/test/resources/valid.xml | 2 +- + 27 files changed, 27 insertions(+), 27 deletions(-) + +diff --git a/xmvn-tools/xmvn-install/src/test/resources/alias.xml b/xmvn-tools/xmvn-install/src/test/resources/alias.xml +index 6e33a2a0..a86d73e9 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/alias.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/alias.xml +@@ -1,5 +1,5 @@ + +- ++ + + + com.example +diff --git a/xmvn-tools/xmvn-install/src/test/resources/compat.xml b/xmvn-tools/xmvn-install/src/test/resources/compat.xml +index 1cd57df9..428177cb 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/compat.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/compat.xml +@@ -1,5 +1,5 @@ + +- ++ + + + com.example +diff --git a/xmvn-tools/xmvn-install/src/test/resources/metadata-uuid.xml b/xmvn-tools/xmvn-install/src/test/resources/metadata-uuid.xml +index cb3fae4e..8f0898c6 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/metadata-uuid.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/metadata-uuid.xml +@@ -1,5 +1,5 @@ + +- ++ + test-uuid + + +diff --git a/xmvn-tools/xmvn-install/src/test/resources/namespace-dep.xml b/xmvn-tools/xmvn-install/src/test/resources/namespace-dep.xml +index d80cf352..59e6767b 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/namespace-dep.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/namespace-dep.xml +@@ -1,5 +1,5 @@ + +- ++ + + + com.example +diff --git a/xmvn-tools/xmvn-install/src/test/resources/namespace.xml b/xmvn-tools/xmvn-install/src/test/resources/namespace.xml +index 7b0b7ada..d4a62f68 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/namespace.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/namespace.xml +@@ -1,5 +1,5 @@ + +- ++ + + + com.example +diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-aid-dep.xml b/xmvn-tools/xmvn-install/src/test/resources/no-aid-dep.xml +index 36548f94..44ec6a89 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/no-aid-dep.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/no-aid-dep.xml +@@ -1,5 +1,5 @@ + +- ++ + + + com.example +diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-aid-excl.xml b/xmvn-tools/xmvn-install/src/test/resources/no-aid-excl.xml +index 5b1c77f1..9aec70fb 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/no-aid-excl.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/no-aid-excl.xml +@@ -1,5 +1,5 @@ + +- ++ + + + com.example +diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-aid.xml b/xmvn-tools/xmvn-install/src/test/resources/no-aid.xml +index b8b33a99..9dd5b97f 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/no-aid.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/no-aid.xml +@@ -1,5 +1,5 @@ + +- ++ + + + com.example +diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-file.xml b/xmvn-tools/xmvn-install/src/test/resources/no-file.xml +index 710567ee..a77dd6cc 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/no-file.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/no-file.xml +@@ -1,5 +1,5 @@ + +- ++ + + + com.example +diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-gid-dep.xml b/xmvn-tools/xmvn-install/src/test/resources/no-gid-dep.xml +index 0fdfec96..53b829ad 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/no-gid-dep.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/no-gid-dep.xml +@@ -1,5 +1,5 @@ + +- ++ + + + com.example +diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-gid-excl.xml b/xmvn-tools/xmvn-install/src/test/resources/no-gid-excl.xml +index 3c135126..c8e3e6c8 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/no-gid-excl.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/no-gid-excl.xml +@@ -1,5 +1,5 @@ + +- ++ + + + com.example +diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-gid.xml b/xmvn-tools/xmvn-install/src/test/resources/no-gid.xml +index 40386690..ba36e50e 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/no-gid.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/no-gid.xml +@@ -1,5 +1,5 @@ + +- ++ + + + com.example +diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-version-dep.xml b/xmvn-tools/xmvn-install/src/test/resources/no-version-dep.xml +index 08587264..49fe2922 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/no-version-dep.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/no-version-dep.xml +@@ -1,5 +1,5 @@ + +- ++ + + + com.example +diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-version.xml b/xmvn-tools/xmvn-install/src/test/resources/no-version.xml +index 480bc8e4..2a8322ab 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/no-version.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/no-version.xml +@@ -1,5 +1,5 @@ + +- ++ + + + com.example +diff --git a/xmvn-tools/xmvn-install/src/test/resources/nonexistent-file.xml b/xmvn-tools/xmvn-install/src/test/resources/nonexistent-file.xml +index 385822b6..400bf234 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/nonexistent-file.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/nonexistent-file.xml +@@ -1,5 +1,5 @@ + +- ++ + + + com.example +diff --git a/xmvn-tools/xmvn-install/src/test/resources/nonreadable-file.xml b/xmvn-tools/xmvn-install/src/test/resources/nonreadable-file.xml +index eb23aba7..cff22643 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/nonreadable-file.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/nonreadable-file.xml +@@ -1,5 +1,5 @@ + +- ++ + + + com.example +diff --git a/xmvn-tools/xmvn-install/src/test/resources/nonregular-file.xml b/xmvn-tools/xmvn-install/src/test/resources/nonregular-file.xml +index 3cd66465..76c34bc9 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/nonregular-file.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/nonregular-file.xml +@@ -1,5 +1,5 @@ + +- ++ + + + com.example +diff --git a/xmvn-tools/xmvn-install/src/test/resources/resolved-version.xml b/xmvn-tools/xmvn-install/src/test/resources/resolved-version.xml +index 9099ec28..9279d896 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/resolved-version.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/resolved-version.xml +@@ -1,5 +1,5 @@ + +- ++ + + + com.example +diff --git a/xmvn-tools/xmvn-install/src/test/resources/skipped.xml b/xmvn-tools/xmvn-install/src/test/resources/skipped.xml +index 66bef3d8..b08836a1 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/skipped.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/skipped.xml +@@ -1,5 +1,5 @@ + +- ++ + + + com.example +diff --git a/xmvn-tools/xmvn-install/src/test/resources/test-pkg-main.xml b/xmvn-tools/xmvn-install/src/test/resources/test-pkg-main.xml +index 0bcdce1d..0bd964fc 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/test-pkg-main.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/test-pkg-main.xml +@@ -1,5 +1,5 @@ + +- ++ + 1e5b4990-c4e3-42b4-9145-5b7783ab91a2 + + +diff --git a/xmvn-tools/xmvn-install/src/test/resources/test-pkg-resolved.xml b/xmvn-tools/xmvn-install/src/test/resources/test-pkg-resolved.xml +index c9053bbd..9d3bbb67 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/test-pkg-resolved.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/test-pkg-resolved.xml +@@ -1,5 +1,5 @@ + +- ++ + 1e5b4990-c4e3-42b4-9145-5b7783ab91a2 + + +diff --git a/xmvn-tools/xmvn-install/src/test/resources/test-pkg-sub.xml b/xmvn-tools/xmvn-install/src/test/resources/test-pkg-sub.xml +index 32e72e63..068f17f6 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/test-pkg-sub.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/test-pkg-sub.xml +@@ -1,5 +1,5 @@ + +- ++ + 1e5b4990-c4e3-42b4-9145-5b7783ab91a2 + + +diff --git a/xmvn-tools/xmvn-install/src/test/resources/test-pkg.xml b/xmvn-tools/xmvn-install/src/test/resources/test-pkg.xml +index 3364d985..8b0d6223 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/test-pkg.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/test-pkg.xml +@@ -1,5 +1,5 @@ + +- ++ + 1e5b4990-c4e3-42b4-9145-5b7783ab91a2 + + +diff --git a/xmvn-tools/xmvn-install/src/test/resources/uuid.xml b/xmvn-tools/xmvn-install/src/test/resources/uuid.xml +index 9bf862fa..b57b9584 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/uuid.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/uuid.xml +@@ -1,5 +1,5 @@ + +- ++ + + + com.example +diff --git a/xmvn-tools/xmvn-install/src/test/resources/valid.xml b/xmvn-tools/xmvn-install/src/test/resources/valid.xml +index c9a2be8d..f2fa0c24 100644 +--- a/xmvn-tools/xmvn-install/src/test/resources/valid.xml ++++ b/xmvn-tools/xmvn-install/src/test/resources/valid.xml +@@ -1,5 +1,5 @@ + +- ++ + + + com.example +-- +2.20.1 + diff --git a/xmvn.spec b/xmvn.spec index 42e1b25..3eeb016 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -10,7 +10,7 @@ Name: xmvn Version: 3.0.0 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Local Extensions for Apache Maven License: ASL 2.0 URL: https://fedora-java.github.io/xmvn/ @@ -26,6 +26,8 @@ Patch4: 0001-Fix-configuration-of-aliased-plugins.patch Patch5: 0001-Don-t-use-JAXB-for-converting-bytes-to-hex-string.patch Patch6: 0001-Use-apache-commons-compress-for-manifest-injection-a.patch Patch7: 0001-port-to-gradle-4.4.1.patch +Patch8: 0001-test-Fix-XML-namespace-in-installer-test-resources.patch +Patch9: 0001-Port-to-Xmlunit-2.6.2.patch BuildRequires: maven >= 3.5.0 BuildRequires: maven-local @@ -39,7 +41,7 @@ BuildRequires: maven-install-plugin BuildRequires: maven-plugin-plugin BuildRequires: objectweb-asm BuildRequires: modello -BuildRequires: xmlunit +BuildRequires: xmlunit-assertj BuildRequires: apache-ivy BuildRequires: junit BuildRequires: easymock @@ -216,6 +218,8 @@ This package provides %{summary}. %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 +%patch9 -p1 # Bisect IT has no chances of working in local, offline mode, without # network access - it needs to access remote repositories. @@ -365,6 +369,9 @@ cp -P ${maven_home}/bin/m2.conf %{buildroot}%{_datadir}/%{name}/bin/ %doc LICENSE NOTICE %changelog +* Thu Jul 04 2019 Fabio Valentini - 3.0.0-24 +- Port to Xmlunit 2.6.2 + * Sun Feb 03 2019 Fedora Release Engineering - 3.0.0-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild