From 7afe3ff63d76618df81c1e79db5fc5dcd81c4d06 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 22 Apr 2022 03:33:18 +0200 Subject: [PATCH 01/37] Disable more tests that require network access --- ...sable-tests-requiring-network-access.patch | 90 +++++++++++++++---- 0002-Port-to-hamcrest-2.1.patch | 34 +++---- 0003-Drop-support-for-JAXB.patch | 14 +-- xmlunit.spec | 5 +- 4 files changed, 101 insertions(+), 42 deletions(-) diff --git a/0001-Disable-tests-requiring-network-access.patch b/0001-Disable-tests-requiring-network-access.patch index 83c06da..d6772dd 100644 --- a/0001-Disable-tests-requiring-network-access.patch +++ b/0001-Disable-tests-requiring-network-access.patch @@ -1,17 +1,21 @@ -From 73abcb06636217e52a9d56b4dc3c69bd37141d44 Mon Sep 17 00:00:00 2001 +From 81808e548ddc6cf0a3cc12285f48caa2bd517a07 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 4 Mar 2019 14:52:59 +0100 -Subject: [PATCH 1/4] Disable tests requiring network access +Subject: [PATCH 1/3] Disable tests requiring network access --- - .../java/org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java | 2 ++ - .../java/org/xmlunit/assertj3/XmlAssertValidationTest.java | 6 ++++++ - .../java/org/xmlunit/assertj3/XmlAssertValueByXPathTest.java | 2 ++ + .../org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java | 2 ++ + .../java/org/xmlunit/assertj3/XmlAssertValidationTest.java | 6 ++++++ + .../org/xmlunit/assertj3/XmlAssertValueByXPathTest.java | 2 ++ + .../org/custommonkey/xmlunit/test_AbstractNodeTester.java | 2 +- + .../org/custommonkey/xmlunit/test_DifferenceEngine.java | 2 +- + .../org/custommonkey/xmlunit/test_NewDifferenceEngine.java | 2 +- + .../test/java/org/custommonkey/xmlunit/test_Validator.java | 2 +- .../java/org/xmlunit/matchers/ValidationMatcherTest.java | 2 ++ - 4 files changed, 12 insertions(+) + 8 files changed, 16 insertions(+), 4 deletions(-) diff --git a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java -index 6499f67..c465a51 100644 +index 166633e..926c647 100644 --- a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java +++ b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java @@ -13,6 +13,7 @@ @@ -22,7 +26,7 @@ index 6499f67..c465a51 100644 import org.junit.Rule; import org.junit.Test; -@@ -43,6 +44,7 @@ public class XmlAssertNodesByXPathTest { +@@ -43,6 +44,7 @@ public void testAssertThat_withNull_shouldFailed() { } @Test @@ -31,7 +35,7 @@ index 6499f67..c465a51 100644 thrown.expectAssertionError(format("%nExpecting not blank but was:")); diff --git a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValidationTest.java b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValidationTest.java -index 7e2dc0e..f743cc4 100644 +index d4f1e82..027e7e9 100644 --- a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValidationTest.java +++ b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValidationTest.java @@ -14,6 +14,7 @@ @@ -42,7 +46,7 @@ index 7e2dc0e..f743cc4 100644 import org.junit.Rule; import org.junit.Test; import org.xmlunit.TestResources; -@@ -91,6 +92,7 @@ public class XmlAssertValidationTest { +@@ -91,6 +92,7 @@ public void testIsValidAgainst_withBrokenXml_shouldFailed() { } @Test @@ -50,7 +54,7 @@ index 7e2dc0e..f743cc4 100644 public void testIsValidAgainst_withEmptySourcesArray_shouldPass() { StreamSource xml = new StreamSource(new File(TestResources.TEST_RESOURCE_DIR + "BookXsdGenerated.xml")); -@@ -100,6 +102,7 @@ public class XmlAssertValidationTest { +@@ -100,6 +102,7 @@ public void testIsValidAgainst_withEmptySourcesArray_shouldPass() { } @Test @@ -58,7 +62,7 @@ index 7e2dc0e..f743cc4 100644 public void testIsValidAgainst_withBrokenXmlAndEmptySourcesArray_shouldFailed() { thrown.expectAssertionError("1. line=9; column=8; type=ERROR;" + -@@ -112,6 +115,7 @@ public class XmlAssertValidationTest { +@@ -112,6 +115,7 @@ public void testIsValidAgainst_withBrokenXmlAndEmptySourcesArray_shouldFailed() } @Test @@ -66,7 +70,7 @@ index 7e2dc0e..f743cc4 100644 public void testIsValid_shouldPass() { StreamSource xml = new StreamSource(new File(TestResources.TEST_RESOURCE_DIR + "BookXsdGenerated.xml")); -@@ -120,6 +124,7 @@ public class XmlAssertValidationTest { +@@ -120,6 +124,7 @@ public void testIsValid_shouldPass() { } @Test @@ -74,7 +78,7 @@ index 7e2dc0e..f743cc4 100644 public void testIsValid_withBrokenXml_shouldPass() { thrown.expectAssertionError("1. line=9; column=8; type=ERROR;" + -@@ -140,6 +145,7 @@ public class XmlAssertValidationTest { +@@ -140,6 +145,7 @@ public void testIsInvalid_withBrokenXml_shouldPass() { } @Test @@ -83,7 +87,7 @@ index 7e2dc0e..f743cc4 100644 thrown.expectAssertionErrorPattern("^\\nExpecting:\\n <.*" diff --git a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValueByXPathTest.java b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValueByXPathTest.java -index 3ce5284..63c3db0 100644 +index 7ac9a3f..3cb825b 100644 --- a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValueByXPathTest.java +++ b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValueByXPathTest.java @@ -14,6 +14,7 @@ @@ -102,6 +106,58 @@ index 3ce5284..63c3db0 100644 public void testValueByXPath_withNull_shouldFailed() { thrown.expectAssertionError(format("%nExpecting not blank but was:")); +diff --git a/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_AbstractNodeTester.java b/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_AbstractNodeTester.java +index 3a8ac80..df02659 100644 +--- a/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_AbstractNodeTester.java ++++ b/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_AbstractNodeTester.java +@@ -176,7 +176,7 @@ public void testTextNode() { + } + + // never called as NodeTest directly jumps to the document element +- public void testDocumentType() throws Exception { ++ public void no_testDocumentType() throws Exception { + AbstractNodeTester t = new AbstractNodeTester() { }; + DocumentType n = XMLUnit + .buildControlDocument("" +diff --git a/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_DifferenceEngine.java b/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_DifferenceEngine.java +index 344d66c..35220b8 100644 +--- a/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_DifferenceEngine.java ++++ b/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_DifferenceEngine.java +@@ -1020,7 +1020,7 @@ public void testIgnoresDifferencesBetweenDocAndRootElement() + listener.different); + } + +- public void testDoctypeDifferences() throws Exception { ++ public void no_testDoctypeDifferences() throws Exception { + String control = "" + + "" + + ""; +diff --git a/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_NewDifferenceEngine.java b/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_NewDifferenceEngine.java +index 0e23767..526be89 100644 +--- a/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_NewDifferenceEngine.java ++++ b/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_NewDifferenceEngine.java +@@ -567,7 +567,7 @@ public void testIgnoresDifferencesBetweenDocAndRootElement() + listener.different); + } + +- public void testDoctypeDifferences() throws Exception { ++ public void no_testDoctypeDifferences() throws Exception { + String control = "" + + "" + + ""; +diff --git a/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_Validator.java b/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_Validator.java +index ad63592..cfcc5e2 100644 +--- a/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_Validator.java ++++ b/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_Validator.java +@@ -57,7 +57,7 @@ public class test_Validator extends XMLTestCase { + private Validator validator; + private File tempDTDFile; + +- public void testXSchema() throws Exception{ ++ public void no_testXSchema() throws Exception{ + File xsdFile = new File(test_Constants.TEST_RESOURCE_DIR + "Book.xsd"); + assertTrue("xsdFile " + xsdFile.getAbsolutePath() + " exists", + xsdFile.exists()); 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 6f26927..bf9a153 100644 --- a/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java @@ -114,7 +170,7 @@ index 6f26927..bf9a153 100644 import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -@@ -79,6 +80,7 @@ public class ValidationMatcherTest { +@@ -79,6 +80,7 @@ public void shouldThrowOnBrokenInstance() { } @Test @@ -123,5 +179,5 @@ index 6f26927..bf9a153 100644 try { Class.forName("java.nio.file.FileSystem"); -- -2.25.4 +2.35.1 diff --git a/0002-Port-to-hamcrest-2.1.patch b/0002-Port-to-hamcrest-2.1.patch index 70336f6..57e500d 100644 --- a/0002-Port-to-hamcrest-2.1.patch +++ b/0002-Port-to-hamcrest-2.1.patch @@ -1,7 +1,7 @@ -From c81eb91d7b9aa9728dfc83d68a881b4e2a0fa8d2 Mon Sep 17 00:00:00 2001 +From 8d7373f5feef927514339fe42919873836c0f710 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 29 Aug 2019 13:58:24 +0200 -Subject: [PATCH 2/4] Port to hamcrest 2.1 +Subject: [PATCH 2/3] Port to hamcrest 2.1 --- .../src/main/java/org/xmlunit/matchers/CompareMatcher.java | 3 --- @@ -15,7 +15,7 @@ diff --git a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/CompareMatcher. 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; +@@ -33,7 +33,6 @@ import org.hamcrest.BaseMatcher; import org.hamcrest.Description; @@ -23,7 +23,7 @@ index 6452081..226399c 100644 import org.hamcrest.Matcher; import java.lang.reflect.Constructor; -@@ -112,7 +111,6 @@ public final class CompareMatcher extends BaseMatcher +@@ -112,7 +111,6 @@ private CompareMatcher(Object control) { *

* As input all types are supported which are supported by {@link Input#from(Object)}. */ @@ -31,7 +31,7 @@ index 6452081..226399c 100644 public static CompareMatcher isIdenticalTo(final Object control) { return new CompareMatcher(control).checkForIdentical(); } -@@ -128,7 +126,6 @@ public final class CompareMatcher extends BaseMatcher +@@ -128,7 +126,6 @@ public static CompareMatcher isIdenticalTo(final Object control) { *

* As input all types are supported which are supported by {@link Input#from(Object)}. */ @@ -43,7 +43,7 @@ diff --git a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/EvaluateXPathMa 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; +@@ -16,7 +16,6 @@ import org.hamcrest.BaseMatcher; import org.hamcrest.Description; @@ -51,7 +51,7 @@ index 6eb23e5..1e9b8b5 100644 import org.hamcrest.Matcher; import org.w3c.dom.Node; import org.xmlunit.builder.Input; -@@ -93,7 +92,6 @@ public class EvaluateXPathMatcher extends BaseMatcher { +@@ -93,7 +92,6 @@ public EvaluateXPathMatcher(String xPath, Matcher valueMatcher) { * @param valueMatcher matcher for the value at the specified xpath * @return the xpath matcher */ @@ -63,7 +63,7 @@ diff --git a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/HasXPathMatcher 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; +@@ -16,7 +16,6 @@ import org.hamcrest.BaseMatcher; import org.hamcrest.Description; @@ -71,7 +71,7 @@ index 08325cd..6fbf0ac 100644 import org.hamcrest.Matcher; import org.w3c.dom.Node; import org.xmlunit.builder.Input; -@@ -135,7 +134,6 @@ public class HasXPathMatcher extends BaseMatcher { +@@ -135,7 +134,6 @@ public void describeMismatch(Object item, Description mismatchDescription) { * @param xPath the target xpath * @return the xpath matcher */ @@ -91,7 +91,7 @@ index b9002a1..7cd6843 100644 import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; -@@ -128,7 +127,6 @@ public abstract class TypeMatcher extends TypeSafeMatcher { +@@ -128,7 +127,6 @@ private T nullSafeConvert(String item) { * @param valueMatcher valueMatcher for the converted value * @return the BigDecimal matcher */ @@ -99,7 +99,7 @@ index b9002a1..7cd6843 100644 public static TypeMatcher asBigDecimal(Matcher valueMatcher) { return new BigDecimalTypeMatcher(valueMatcher); } -@@ -146,7 +144,6 @@ public abstract class TypeMatcher extends TypeSafeMatcher { +@@ -146,7 +144,6 @@ public static TypeMatcher asBigDecimal(Matcher * @param valueMatcher valueMatcher for the converted value * @return the Double matcher */ @@ -107,7 +107,7 @@ index b9002a1..7cd6843 100644 public static TypeMatcher asDouble(Matcher valueMatcher) { return new DoubleTypeMatcher(valueMatcher); } -@@ -164,7 +161,6 @@ public abstract class TypeMatcher extends TypeSafeMatcher { +@@ -164,7 +161,6 @@ public static TypeMatcher asDouble(Matcher valueMatche * @param valueMatcher valueMatcher for the converted value * @return the Integer matcher */ @@ -115,7 +115,7 @@ index b9002a1..7cd6843 100644 public static TypeMatcher asInt(Matcher valueMatcher) { return new IntegerTypeMatcher(valueMatcher); } -@@ -182,7 +178,6 @@ public abstract class TypeMatcher extends TypeSafeMatcher { +@@ -182,7 +178,6 @@ public static TypeMatcher asInt(Matcher valueMatcher * @param valueMatcher valueMatcher for the converted value * @return the Boolean matcher */ @@ -127,7 +127,7 @@ diff --git a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/ValidationMatch 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; +@@ -27,7 +27,6 @@ import org.xmlunit.validation.ValidationResult; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; @@ -135,7 +135,7 @@ index 3126349..51f58ec 100644 import javax.xml.transform.Source; import javax.xml.validation.Schema; -@@ -121,7 +120,6 @@ public class ValidationMatcher extends BaseMatcher { +@@ -121,7 +120,6 @@ public void describeMismatch(final Object item, final Description mismatchDescri } } @@ -143,7 +143,7 @@ index 3126349..51f58ec 100644 public static ValidationMatcher valid(final Object schemaSource) { return new ValidationMatcher(schemaSource); } -@@ -129,7 +127,6 @@ public class ValidationMatcher extends BaseMatcher { +@@ -129,7 +127,6 @@ public static ValidationMatcher valid(final Object schemaSource) { /** * @since XMLUnit 2.3.0 */ @@ -152,5 +152,5 @@ index 3126349..51f58ec 100644 return new ValidationMatcher(schema); } -- -2.21.0 +2.35.1 diff --git a/0003-Drop-support-for-JAXB.patch b/0003-Drop-support-for-JAXB.patch index 923eb35..6ec390e 100644 --- a/0003-Drop-support-for-JAXB.patch +++ b/0003-Drop-support-for-JAXB.patch @@ -1,7 +1,7 @@ -From 9866f331db726db0ac6af64649c308b01b34ea56 Mon Sep 17 00:00:00 2001 +From 4b30dd33332f79c71697c8a9bdbf39d74fb06c4a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 12:14:08 +0100 -Subject: [PATCH 4/4] Drop support for JAXB +Subject: [PATCH 3/3] Drop support for JAXB --- xmlunit-core/src/main/java/org/xmlunit/builder/Input.java | 4 ++-- @@ -12,7 +12,7 @@ diff --git a/xmlunit-core/src/main/java/org/xmlunit/builder/Input.java b/xmlunit index 27d9c5a..81165cc 100644 --- a/xmlunit-core/src/main/java/org/xmlunit/builder/Input.java +++ b/xmlunit-core/src/main/java/org/xmlunit/builder/Input.java -@@ -153,8 +153,8 @@ public class Input { +@@ -153,8 +153,8 @@ public static Builder from(Object object) { /** * Build a Source from a Jaxb-Object. */ @@ -27,7 +27,7 @@ diff --git a/xmlunit-core/src/test/java/org/xmlunit/builder/InputTest.java b/xml index e767f38..98e3fe7 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; +@@ -31,7 +31,6 @@ import org.xmlunit.NullNode; import org.xmlunit.TestResources; import org.xmlunit.XMLUnitException; @@ -35,7 +35,7 @@ index e767f38..98e3fe7 100644 import org.xmlunit.util.Convert; import org.xmlunit.xpath.JAXPXPathEngine; -@@ -132,10 +131,6 @@ public class InputTest { +@@ -132,10 +131,6 @@ private static Document parse(Source s) throws Exception { allIsWellFor(s, "furry"); } @@ -46,7 +46,7 @@ index e767f38..98e3fe7 100644 @Test public void shouldParseUnknownToSource() throws Exception { // from Source allIsWellFor(Input.from(Input.fromByteArray(readTestFile()).build()).build()); -@@ -153,8 +148,6 @@ public class InputTest { +@@ -153,8 +148,6 @@ private static Document parse(Source s) throws Exception { allIsWellFor(Input.from(new URI("file:" + TestResources.ANIMAL_FILE)).build()); // from URL allIsWellFor(Input.from(new URL("file:" + TestResources.ANIMAL_FILE)).build()); @@ -56,5 +56,5 @@ index e767f38..98e3fe7 100644 try (FileInputStream is = new FileInputStream(TestResources.ANIMAL_FILE)) { allIsWellFor(Input.from(is).build()); -- -2.29.2 +2.35.1 diff --git a/xmlunit.spec b/xmlunit.spec index be7b094..5ef162c 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -2,7 +2,7 @@ Name: xmlunit Version: 2.8.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Provides classes to do asserts on xml # The whole package is ASL 2.0 except for xmlunit-legacy which is BSD License: ASL 2.0 and BSD @@ -116,6 +116,9 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %files placeholders -f .mfiles-xmlunit-placeholders %changelog +* Fri Apr 22 2022 Mikolaj Izdebski - 2.8.2-7 +- Disable more tests that require network access + * Sat Feb 05 2022 Jiri Vanek - 2.8.2-6 - Rebuilt for java-17-openjdk as system jdk From 8356ea3cc8da587a774d72c9558aa354ab7664ec Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:24 +0200 Subject: [PATCH 02/37] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- xmlunit.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xmlunit.spec b/xmlunit.spec index 5ef162c..cbc860b 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -8,6 +8,7 @@ Summary: Provides classes to do asserts on xml License: ASL 2.0 and BSD URL: https://www.xmlunit.org/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz From c28d2d30f7fbda04ab1d5e0630aedd7172d941f0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 08:03:17 +0200 Subject: [PATCH 03/37] Update build-requires in bootstrap mode --- xmlunit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlunit.spec b/xmlunit.spec index cbc860b..d1442eb 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -19,10 +19,10 @@ Patch1: 0001-Disable-tests-requiring-network-access.patch Patch2: 0002-Port-to-hamcrest-2.1.patch Patch3: 0003-Drop-support-for-JAXB.patch -BuildRequires: maven-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else +BuildRequires: maven-local BuildRequires: mvn(junit:junit) BuildRequires: mvn(net.bytebuddy:byte-buddy) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) From 962595184feff8ed54887cf368131e0c5377417e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:19:18 +0000 Subject: [PATCH 04/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlunit.spec b/xmlunit.spec index d1442eb..beea329 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -2,7 +2,7 @@ Name: xmlunit Version: 2.8.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Provides classes to do asserts on xml # The whole package is ASL 2.0 except for xmlunit-legacy which is BSD License: ASL 2.0 and BSD @@ -117,6 +117,9 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %files placeholders -f .mfiles-xmlunit-placeholders %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2.8.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Apr 22 2022 Mikolaj Izdebski - 2.8.2-7 - Disable more tests that require network access From b6a986a9ba26ad467c41f27fab1d09a51de47230 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Aug 2022 08:36:52 +0200 Subject: [PATCH 05/37] Onboard package into gating --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 8 ++++++++ plans/javapackages.fmf | 7 +++++++ 4 files changed, 17 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..8f6c9cb --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f37 +execute: + how: tmt From 7d696257b1d91a5deaaeee6d902293ee1775b01d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Aug 2022 08:36:52 +0200 Subject: [PATCH 06/37] Update to upstream version 2.9.0 --- .gitignore | 1 + ...sable-tests-requiring-network-access.patch | 140 ++-------------- 0002-Port-to-hamcrest-2.1.patch | 156 ------------------ 0002-Use-local-schema.patch | 50 ++++++ 0003-Drop-support-for-JAXB.patch | 23 ++- 0004-Port-to-assertj-core-3.patch | 31 ++++ generate-tarball.sh | 2 +- sources | 2 +- xmlunit.spec | 30 +++- 9 files changed, 132 insertions(+), 303 deletions(-) delete mode 100644 0002-Port-to-hamcrest-2.1.patch create mode 100644 0002-Use-local-schema.patch create mode 100644 0004-Port-to-assertj-core-3.patch diff --git a/.gitignore b/.gitignore index b9d742b..7c337b9 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /xmlunit-2.7.0-src.tar.gz /xmlunit-2.8.2-src.tar.gz /xmlunit-2.8.2.tar.gz +/xmlunit-2.9.0.tar.gz diff --git a/0001-Disable-tests-requiring-network-access.patch b/0001-Disable-tests-requiring-network-access.patch index d6772dd..b189276 100644 --- a/0001-Disable-tests-requiring-network-access.patch +++ b/0001-Disable-tests-requiring-network-access.patch @@ -1,116 +1,20 @@ -From 81808e548ddc6cf0a3cc12285f48caa2bd517a07 Mon Sep 17 00:00:00 2001 +From e20a29e689eab30408ccf495590d74c207092e3d Mon Sep 17 00:00:00 2001 From: Marian Koncek -Date: Mon, 4 Mar 2019 14:52:59 +0100 -Subject: [PATCH 1/3] Disable tests requiring network access +Date: Fri, 9 Sep 2022 15:08:45 +0200 +Subject: [PATCH 1/2] Disable tests requiring network access --- - .../org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java | 2 ++ - .../java/org/xmlunit/assertj3/XmlAssertValidationTest.java | 6 ++++++ - .../org/xmlunit/assertj3/XmlAssertValueByXPathTest.java | 2 ++ - .../org/custommonkey/xmlunit/test_AbstractNodeTester.java | 2 +- - .../org/custommonkey/xmlunit/test_DifferenceEngine.java | 2 +- - .../org/custommonkey/xmlunit/test_NewDifferenceEngine.java | 2 +- - .../test/java/org/custommonkey/xmlunit/test_Validator.java | 2 +- - .../java/org/xmlunit/matchers/ValidationMatcherTest.java | 2 ++ - 8 files changed, 16 insertions(+), 4 deletions(-) + .../java/org/custommonkey/xmlunit/test_AbstractNodeTester.java | 2 +- + .../java/org/custommonkey/xmlunit/test_DifferenceEngine.java | 2 +- + .../java/org/custommonkey/xmlunit/test_NewDifferenceEngine.java | 2 +- + .../src/test/java/org/custommonkey/xmlunit/test_Validator.java | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java -index 166633e..926c647 100644 ---- a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java -+++ b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java -@@ -13,6 +13,7 @@ - */ - package org.xmlunit.assertj3; - -+import org.junit.Ignore; - import org.junit.Rule; - import org.junit.Test; - -@@ -43,6 +44,7 @@ public void testAssertThat_withNull_shouldFailed() { - } - - @Test -+ @Ignore - public void testNodesByXPath_withNull_shouldFailed() { - - thrown.expectAssertionError(format("%nExpecting not blank but was:")); -diff --git a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValidationTest.java b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValidationTest.java -index d4f1e82..027e7e9 100644 ---- a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValidationTest.java -+++ b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValidationTest.java -@@ -14,6 +14,7 @@ - package org.xmlunit.assertj3; - - import org.junit.ClassRule; -+import org.junit.Ignore; - import org.junit.Rule; - import org.junit.Test; - import org.xmlunit.TestResources; -@@ -91,6 +92,7 @@ public void testIsValidAgainst_withBrokenXml_shouldFailed() { - } - - @Test -+ @Ignore - public void testIsValidAgainst_withEmptySourcesArray_shouldPass() { - - StreamSource xml = new StreamSource(new File(TestResources.TEST_RESOURCE_DIR + "BookXsdGenerated.xml")); -@@ -100,6 +102,7 @@ public void testIsValidAgainst_withEmptySourcesArray_shouldPass() { - } - - @Test -+ @Ignore - public void testIsValidAgainst_withBrokenXmlAndEmptySourcesArray_shouldFailed() { - - thrown.expectAssertionError("1. line=9; column=8; type=ERROR;" + -@@ -112,6 +115,7 @@ public void testIsValidAgainst_withBrokenXmlAndEmptySourcesArray_shouldFailed() - } - - @Test -+ @Ignore - public void testIsValid_shouldPass() { - - StreamSource xml = new StreamSource(new File(TestResources.TEST_RESOURCE_DIR + "BookXsdGenerated.xml")); -@@ -120,6 +124,7 @@ public void testIsValid_shouldPass() { - } - - @Test -+ @Ignore - public void testIsValid_withBrokenXml_shouldPass() { - - thrown.expectAssertionError("1. line=9; column=8; type=ERROR;" + -@@ -140,6 +145,7 @@ public void testIsInvalid_withBrokenXml_shouldPass() { - } - - @Test -+ @Ignore - public void testIsInvalid_shouldField() { - - thrown.expectAssertionErrorPattern("^\\nExpecting:\\n <.*" -diff --git a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValueByXPathTest.java b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValueByXPathTest.java -index 7ac9a3f..3cb825b 100644 ---- a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValueByXPathTest.java -+++ b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValueByXPathTest.java -@@ -14,6 +14,7 @@ - package org.xmlunit.assertj3; - - import org.junit.ClassRule; -+import org.junit.Ignore; - import org.junit.Rule; - import org.junit.Test; - import org.xmlunit.assertj3.util.SetEnglishLocaleRule; -@@ -31,6 +32,7 @@ public class XmlAssertValueByXPathTest { - public static SetEnglishLocaleRule locale = new SetEnglishLocaleRule(); - - @Test -+ @Ignore - public void testValueByXPath_withNull_shouldFailed() { - - thrown.expectAssertionError(format("%nExpecting not blank but was:")); diff --git a/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_AbstractNodeTester.java b/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_AbstractNodeTester.java index 3a8ac80..df02659 100644 --- a/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_AbstractNodeTester.java +++ b/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_AbstractNodeTester.java -@@ -176,7 +176,7 @@ public void testTextNode() { +@@ -176,7 +176,7 @@ public class test_AbstractNodeTester extends TestCase { } // never called as NodeTest directly jumps to the document element @@ -123,7 +27,7 @@ diff --git a/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_Differen index 344d66c..35220b8 100644 --- a/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_DifferenceEngine.java +++ b/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_DifferenceEngine.java -@@ -1020,7 +1020,7 @@ public void testIgnoresDifferencesBetweenDocAndRootElement() +@@ -1020,7 +1020,7 @@ public class test_DifferenceEngine extends TestCase implements DifferenceConstan listener.different); } @@ -136,7 +40,7 @@ diff --git a/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_NewDiffe index 0e23767..526be89 100644 --- a/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_NewDifferenceEngine.java +++ b/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_NewDifferenceEngine.java -@@ -567,7 +567,7 @@ public void testIgnoresDifferencesBetweenDocAndRootElement() +@@ -567,7 +567,7 @@ public class test_NewDifferenceEngine extends TestCase implements DifferenceCons listener.different); } @@ -158,26 +62,6 @@ index ad63592..cfcc5e2 100644 File xsdFile = new File(test_Constants.TEST_RESOURCE_DIR + "Book.xsd"); assertTrue("xsdFile " + xsdFile.getAbsolutePath() + " exists", xsdFile.exists()); -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 6f26927..bf9a153 100644 ---- a/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java -+++ b/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java -@@ -13,6 +13,7 @@ - */ - package org.xmlunit.matchers; - -+import org.junit.Ignore; - import org.junit.Rule; - import org.junit.Test; - import org.junit.rules.ExpectedException; -@@ -79,6 +80,7 @@ public void shouldThrowOnBrokenInstance() { - } - - @Test -+ @Ignore - public void shouldSuccessfullyValidateInstanceWithoutExplicitSchemaSource() { - try { - Class.forName("java.nio.file.FileSystem"); -- -2.35.1 +2.37.3 diff --git a/0002-Port-to-hamcrest-2.1.patch b/0002-Port-to-hamcrest-2.1.patch deleted file mode 100644 index 57e500d..0000000 --- a/0002-Port-to-hamcrest-2.1.patch +++ /dev/null @@ -1,156 +0,0 @@ -From 8d7373f5feef927514339fe42919873836c0f710 Mon Sep 17 00:00:00 2001 -From: Marian Koncek -Date: Thu, 29 Aug 2019 13:58:24 +0200 -Subject: [PATCH 2/3] 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.hamcrest.BaseMatcher; - import org.hamcrest.Description; --import org.hamcrest.Factory; - import org.hamcrest.Matcher; - - import java.lang.reflect.Constructor; -@@ -112,7 +111,6 @@ private CompareMatcher(Object control) { - *

- * 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 static CompareMatcher isIdenticalTo(final Object control) { - *

- * 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 @@ - - 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 EvaluateXPathMatcher(String xPath, Matcher valueMatcher) { - * @param valueMatcher matcher for the value at the specified xpath - * @return the xpath matcher - */ -- @Factory - public static EvaluateXPathMatcher hasXPath(String xPath, Matcher 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 @@ - - 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 void describeMismatch(Object item, Description mismatchDescription) { - * @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 @@ private T nullSafeConvert(String item) { - * @param valueMatcher valueMatcher for the converted value - * @return the BigDecimal matcher - */ -- @Factory - public static TypeMatcher asBigDecimal(Matcher valueMatcher) { - return new BigDecimalTypeMatcher(valueMatcher); - } -@@ -146,7 +144,6 @@ public static TypeMatcher asBigDecimal(Matcher - * @param valueMatcher valueMatcher for the converted value - * @return the Double matcher - */ -- @Factory - public static TypeMatcher asDouble(Matcher valueMatcher) { - return new DoubleTypeMatcher(valueMatcher); - } -@@ -164,7 +161,6 @@ public static TypeMatcher asDouble(Matcher valueMatche - * @param valueMatcher valueMatcher for the converted value - * @return the Integer matcher - */ -- @Factory - public static TypeMatcher asInt(Matcher valueMatcher) { - return new IntegerTypeMatcher(valueMatcher); - } -@@ -182,7 +178,6 @@ public static TypeMatcher asInt(Matcher valueMatcher - * @param valueMatcher valueMatcher for the converted value - * @return the Boolean matcher - */ -- @Factory - public static TypeMatcher asBoolean(Matcher 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.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 void describeMismatch(final Object item, final Description mismatchDescri - } - } - -- @Factory - public static ValidationMatcher valid(final Object schemaSource) { - return new ValidationMatcher(schemaSource); - } -@@ -129,7 +127,6 @@ public static ValidationMatcher valid(final Object schemaSource) { - /** - * @since XMLUnit 2.3.0 - */ -- @Factory - public static ValidationMatcher valid(final Schema schema) { - return new ValidationMatcher(schema); - } --- -2.35.1 - diff --git a/0002-Use-local-schema.patch b/0002-Use-local-schema.patch new file mode 100644 index 0000000..eeda0ae --- /dev/null +++ b/0002-Use-local-schema.patch @@ -0,0 +1,50 @@ +From 4d3f414382866e26eac672026cb294e5250375b4 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Mon, 26 Sep 2022 12:28:11 +0200 +Subject: [PATCH 2/2] Use local schema + +--- + test-resources/BookXsdGenerated.xml | 2 +- + test-resources/BookXsdGeneratedWithComment.xml | 2 +- + test-resources/invalidBook.xml | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/test-resources/BookXsdGenerated.xml b/test-resources/BookXsdGenerated.xml +index 1f55b93..2f09a58 100644 +--- a/test-resources/BookXsdGenerated.xml ++++ b/test-resources/BookXsdGenerated.xml +@@ -1,5 +1,5 @@ + +- ++ + Chicken Soup for the Soul + Jack Canfield + Mark Victor Hansen +diff --git a/test-resources/BookXsdGeneratedWithComment.xml b/test-resources/BookXsdGeneratedWithComment.xml +index e6f0364..d64500d 100644 +--- a/test-resources/BookXsdGeneratedWithComment.xml ++++ b/test-resources/BookXsdGeneratedWithComment.xml +@@ -1,6 +1,6 @@ + + +- ++ + Chicken Soup for the Soul + Jack Canfield + Mark Victor Hansen +diff --git a/test-resources/invalidBook.xml b/test-resources/invalidBook.xml +index 1d50d5c..5858d00 100644 +--- a/test-resources/invalidBook.xml ++++ b/test-resources/invalidBook.xml +@@ -1,6 +1,6 @@ + +- ++ + Chicken Soup for the Soul + Jack Canfield + Mark Victor Hansen +-- +2.37.3 + diff --git a/0003-Drop-support-for-JAXB.patch b/0003-Drop-support-for-JAXB.patch index 6ec390e..eb852e3 100644 --- a/0003-Drop-support-for-JAXB.patch +++ b/0003-Drop-support-for-JAXB.patch @@ -4,20 +4,25 @@ Date: Tue, 5 Nov 2019 12:14:08 +0100 Subject: [PATCH 3/3] Drop support for JAXB --- - xmlunit-core/src/main/java/org/xmlunit/builder/Input.java | 4 ++-- + xmlunit-core/src/main/java/org/xmlunit/builder/Input.java | 6 +++--- .../src/test/java/org/xmlunit/builder/InputTest.java | 7 ------- - 2 files changed, 2 insertions(+), 9 deletions(-) + 2 files changed, 3 insertions(+), 10 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 27d9c5a..81165cc 100644 +index 157aa7d..d158141 100644 --- a/xmlunit-core/src/main/java/org/xmlunit/builder/Input.java +++ b/xmlunit-core/src/main/java/org/xmlunit/builder/Input.java -@@ -153,8 +153,8 @@ public static Builder from(Object object) { +@@ -149,12 +149,12 @@ public class Input { + } + return xml; + } +- ++ /** * Build a Source from a Jaxb-Object. */ - public static JaxbBuilder fromJaxb(Object jaxbObject) { -- return new JaxbBuilder(jaxbObject); +- return JaxbBuilderFactoryLocator.getFactory().create(jaxbObject); + public static Builder fromJaxb(Object jaxbObject) { + throw new RuntimeException("This implementation has JAXB support removed"); } @@ -27,7 +32,7 @@ diff --git a/xmlunit-core/src/test/java/org/xmlunit/builder/InputTest.java b/xml index e767f38..98e3fe7 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 @@ +@@ -31,7 +31,6 @@ import org.w3c.dom.Document; import org.xmlunit.NullNode; import org.xmlunit.TestResources; import org.xmlunit.XMLUnitException; @@ -35,7 +40,7 @@ index e767f38..98e3fe7 100644 import org.xmlunit.util.Convert; import org.xmlunit.xpath.JAXPXPathEngine; -@@ -132,10 +131,6 @@ private static Document parse(Source s) throws Exception { +@@ -132,10 +131,6 @@ public class InputTest { allIsWellFor(s, "furry"); } @@ -46,7 +51,7 @@ index e767f38..98e3fe7 100644 @Test public void shouldParseUnknownToSource() throws Exception { // from Source allIsWellFor(Input.from(Input.fromByteArray(readTestFile()).build()).build()); -@@ -153,8 +148,6 @@ private static Document parse(Source s) throws Exception { +@@ -153,8 +148,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()); @@ -56,5 +61,5 @@ index e767f38..98e3fe7 100644 try (FileInputStream is = new FileInputStream(TestResources.ANIMAL_FILE)) { allIsWellFor(Input.from(is).build()); -- -2.35.1 +2.37.2 diff --git a/0004-Port-to-assertj-core-3.patch b/0004-Port-to-assertj-core-3.patch new file mode 100644 index 0000000..48f70ab --- /dev/null +++ b/0004-Port-to-assertj-core-3.patch @@ -0,0 +1,31 @@ +From 7077eac701bca8e63d16aede77a73474d5fe79af Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Mon, 26 Sep 2022 13:53:53 +0200 +Subject: [PATCH] Port to assertj-core 3 + +--- + .../src/test/java/org/xmlunit/assertj3/ValueAssertTest.java | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/ValueAssertTest.java b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/ValueAssertTest.java +index fa12a7f..6e7bb55 100644 +--- a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/ValueAssertTest.java ++++ b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/ValueAssertTest.java +@@ -283,10 +283,13 @@ public class ValueAssertTest { + + thrown.expectAssertionErrorPattern(".*(" + // AssertJ 3.18.1 +- + Pattern.quote("expected:<\"[something]\"> but was:<\"[abc]\">") ++ + Pattern.quote("expected: \"something\"\nbut was : \"abc\"") + + "|" + // AssertJ 3.19.0+ + + Pattern.quote("Expecting:\n <\"abc\">\nto be equal to:\n <\"something\">\nbut was not.") ++ + "|" ++ // AssertJ 3.23.0+ ++ + Pattern.quote("[XPath \"//a/b/@attr\" evaluated to value] \nexpected: \"something\"\n but was: \"abc\"") + + ")"); + + String xml = ""; +-- +2.37.3 + diff --git a/generate-tarball.sh b/generate-tarball.sh index 78e9858..5b8b1ff 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -10,7 +10,7 @@ wget "https://github.com/xmlunit/xmlunit/releases/download/v${version}/${name}-$ rm -rf tarball-tmp mkdir tarball-tmp pushd tarball-tmp -tar xf "../${name}-${version}.orig.tar.gz" +tar -xf "../${name}-${version}.orig.tar.gz" # CLEAN TARBALL rm */GPATH */GRTAGS */GTAGS diff --git a/sources b/sources index d6b2b2b..04f0f9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlunit-2.8.2.tar.gz) = 345ef6b8072d2a27e880475d813c704636cf029cd8c43ea639828775fc8c5713ceed908f01b80f6decf6e36fbac7ddca41c09a1222aee23540305c9c25a75154 +SHA512 (xmlunit-2.9.0.tar.gz) = ac00537052e6947a14ac44e69f236286dab8b62907d3357953421a9533dc32aac6d92ab8176bccfc0e4a116c7397eb85539b9b6e13a6c7aa12cf9aa8106f426d diff --git a/xmlunit.spec b/xmlunit.spec index beea329..01d5183 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: xmlunit -Version: 2.8.2 -Release: 8%{?dist} +Version: 2.9.0 +Release: 1%{?dist} Summary: Provides classes to do asserts on xml # The whole package is ASL 2.0 except for xmlunit-legacy which is BSD License: ASL 2.0 and BSD @@ -16,13 +16,17 @@ Source0: %{name}-%{version}.tar.gz Source1: generate-tarball.sh Patch1: 0001-Disable-tests-requiring-network-access.patch -Patch2: 0002-Port-to-hamcrest-2.1.patch +# This also solves the problem of tests requiring network. The files that would +# be fetched are identical to the local file +Patch2: 0002-Use-local-schema.patch Patch3: 0003-Drop-support-for-JAXB.patch +Patch4: 0004-Port-to-assertj-core-3.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local +BuildRequires: javapackages-extra BuildRequires: mvn(junit:junit) BuildRequires: mvn(net.bytebuddy:byte-buddy) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -78,14 +82,21 @@ This package provides %{summary}. %patch1 -p1 %patch2 -p1 -%patch3 -p1 -# Tests compare the string constent of thrown exceptions -# and we use a different version of assertj -find xmlunit-assertj3/src/test -name '*.java' -exec sed -i 's/\(Expecting not blank but was:\)<\(.*\)>/\1 \2/' {} + -sed -i 's/\(expected:\)<\\"\[\(something\)\]\\"> but was:<\\"\[\(abc\)\]\\">/\1 \\"\2\\"\\nbut was : \\"\3\\"/' xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/ValueAssertTest.java +%patch3 -p1 +rm -r xmlunit-core/src/main/java/org/xmlunit/builder/javax_jaxb\ + xmlunit-core/src/main/java/org/xmlunit/builder/JaxbBuilderFactory.java\ + xmlunit-core/src/main/java/org/xmlunit/builder/JaxbBuilderFactoryLocator.java\ + xmlunit-core/src/test/java/org/xmlunit/builder/javax_jaxb\ +; + +%patch4 -p1 + +# Port to hamcrest 2.1 +%java_remove_annotations xmlunit-matchers -p org[.]hamcrest[.]Factory %pom_disable_module xmlunit-assertj +%pom_disable_module xmlunit-jakarta-jaxb-impl %pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin %pom_remove_plugin :maven-assembly-plugin @@ -117,6 +128,9 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %files placeholders -f .mfiles-xmlunit-placeholders %changelog +* Fri Sep 09 2022 Marian Koncek - 2.9.0-1 +- Update to upstream version 2.9.0 + * Sat Jul 23 2022 Fedora Release Engineering - 2.8.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 8928998fc2ef50cb137fc103640d055b9db01db1 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 4 Oct 2022 08:58:17 +0200 Subject: [PATCH 07/37] Fix BuildRequires on javapackages-extra --- xmlunit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlunit.spec b/xmlunit.spec index 01d5183..da959d6 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -22,11 +22,11 @@ Patch2: 0002-Use-local-schema.patch Patch3: 0003-Drop-support-for-JAXB.patch Patch4: 0004-Port-to-assertj-core-3.patch +BuildRequires: javapackages-extra %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local -BuildRequires: javapackages-extra BuildRequires: mvn(junit:junit) BuildRequires: mvn(net.bytebuddy:byte-buddy) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) From 9ec3afc0054264afcbfbe7228e8483bc43691d7f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 4 Oct 2022 12:48:13 +0200 Subject: [PATCH 08/37] Fix BuildRequires on javapackages-extra --- xmlunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlunit.spec b/xmlunit.spec index da959d6..50ecad8 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -2,7 +2,7 @@ Name: xmlunit Version: 2.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Provides classes to do asserts on xml # The whole package is ASL 2.0 except for xmlunit-legacy which is BSD License: ASL 2.0 and BSD @@ -128,6 +128,9 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %files placeholders -f .mfiles-xmlunit-placeholders %changelog +* Tue Oct 04 2022 Mikolaj Izdebski - 2.9.0-2 +- Fix BuildRequires on javapackages-extra + * Fri Sep 09 2022 Marian Koncek - 2.9.0-1 - Update to upstream version 2.9.0 From 0219195d5d3d53fbbb40bb8a032f1bc35ff6dcb4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:39:52 +0000 Subject: [PATCH 09/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlunit.spec b/xmlunit.spec index 50ecad8..396a754 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -2,7 +2,7 @@ Name: xmlunit Version: 2.9.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Provides classes to do asserts on xml # The whole package is ASL 2.0 except for xmlunit-legacy which is BSD License: ASL 2.0 and BSD @@ -128,6 +128,9 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %files placeholders -f .mfiles-xmlunit-placeholders %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Oct 04 2022 Mikolaj Izdebski - 2.9.0-2 - Fix BuildRequires on javapackages-extra From 4d60eab84ad6ad3aafc7a1991c9381e36afc0afc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:03:30 +0000 Subject: [PATCH 10/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlunit.spec b/xmlunit.spec index 396a754..9d94c1d 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -2,7 +2,7 @@ Name: xmlunit Version: 2.9.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Provides classes to do asserts on xml # The whole package is ASL 2.0 except for xmlunit-legacy which is BSD License: ASL 2.0 and BSD @@ -128,6 +128,9 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %files placeholders -f .mfiles-xmlunit-placeholders %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2.9.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 2.9.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 40fa955d80b6a69893cea57b53c62e6a18fd31c8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 30 Aug 2023 07:05:27 +0200 Subject: [PATCH 11/37] Build with Jurand instead of deprecated javapackages-extra --- xmlunit.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmlunit.spec b/xmlunit.spec index 9d94c1d..d212f20 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -2,7 +2,7 @@ Name: xmlunit Version: 2.9.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Provides classes to do asserts on xml # The whole package is ASL 2.0 except for xmlunit-legacy which is BSD License: ASL 2.0 and BSD @@ -22,7 +22,6 @@ Patch2: 0002-Use-local-schema.patch Patch3: 0003-Drop-support-for-JAXB.patch Patch4: 0004-Port-to-assertj-core-3.patch -BuildRequires: javapackages-extra %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else @@ -35,6 +34,7 @@ BuildRequires: mvn(org.hamcrest:hamcrest-core) BuildRequires: mvn(org.hamcrest:hamcrest-library) BuildRequires: mvn(org.mockito:mockito-core) %endif +BuildRequires: jurand %description XMLUnit provides you with the tools to verify the XML you emit is the one you @@ -128,6 +128,9 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %files placeholders -f .mfiles-xmlunit-placeholders %changelog +* Wed Aug 30 2023 Mikolaj Izdebski - 2.9.0-5 +- Build with Jurand instead of deprecated javapackages-extra + * Sat Jul 22 2023 Fedora Release Engineering - 2.9.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 1ffa80dbb828890b6bcb7d9218469ff8a0247d20 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 14:11:19 +0200 Subject: [PATCH 12/37] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 --- xmlunit.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xmlunit.spec b/xmlunit.spec index d212f20..049aa68 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -2,10 +2,10 @@ Name: xmlunit Version: 2.9.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Provides classes to do asserts on xml # The whole package is ASL 2.0 except for xmlunit-legacy which is BSD -License: ASL 2.0 and BSD +License: Apache-2.0 URL: https://www.xmlunit.org/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -61,6 +61,7 @@ This package provides %{summary}. %package legacy Summary: Legacy package for %{name} +License: BSD-3-Clause %description legacy This package provides %{summary}. @@ -128,6 +129,9 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %files placeholders -f .mfiles-xmlunit-placeholders %changelog +* Fri Sep 01 2023 Mikolaj Izdebski - 2.9.0-6 +- Convert License tag to SPDX format + * Wed Aug 30 2023 Mikolaj Izdebski - 2.9.0-5 - Build with Jurand instead of deprecated javapackages-extra From 69e3dfa8e7efd620f98ee714c86934bcd43e81d4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:08 +0200 Subject: [PATCH 13/37] Update javapackages test plan to f40 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 8f6c9cb..a2cdaba 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f37 + ref: f40 execute: how: tmt From 825e5fc9d965be21a045f79edb30f155de5e116c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:54:10 +0000 Subject: [PATCH 14/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xmlunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlunit.spec b/xmlunit.spec index 049aa68..c0c28aa 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -2,7 +2,7 @@ Name: xmlunit Version: 2.9.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Provides classes to do asserts on xml # The whole package is ASL 2.0 except for xmlunit-legacy which is BSD License: Apache-2.0 @@ -129,6 +129,9 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %files placeholders -f .mfiles-xmlunit-placeholders %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2.9.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Sep 01 2023 Mikolaj Izdebski - 2.9.0-6 - Convert License tag to SPDX format From 23ec835aa1e40d2d8d4309f0bdf1a170e13f0deb Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 20 Feb 2024 08:40:17 +0100 Subject: [PATCH 15/37] Update Java source/target to 1.8 --- xmlunit.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/xmlunit.spec b/xmlunit.spec index c0c28aa..e554e9d 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -2,7 +2,7 @@ Name: xmlunit Version: 2.9.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Provides classes to do asserts on xml # The whole package is ASL 2.0 except for xmlunit-legacy which is BSD License: Apache-2.0 @@ -81,17 +81,17 @@ This package provides %{summary}. %prep %setup -q -n %{name}-%{version}-src -%patch1 -p1 -%patch2 -p1 +%patch 1 -p1 +%patch 2 -p1 -%patch3 -p1 +%patch 3 -p1 rm -r xmlunit-core/src/main/java/org/xmlunit/builder/javax_jaxb\ xmlunit-core/src/main/java/org/xmlunit/builder/JaxbBuilderFactory.java\ xmlunit-core/src/main/java/org/xmlunit/builder/JaxbBuilderFactoryLocator.java\ xmlunit-core/src/test/java/org/xmlunit/builder/javax_jaxb\ ; -%patch4 -p1 +%patch 4 -p1 # Port to hamcrest 2.1 %java_remove_annotations xmlunit-matchers -p org[.]hamcrest[.]Factory @@ -112,7 +112,7 @@ rm -r xmlunit-core/src/main/java/org/xmlunit/builder/javax_jaxb\ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder.java,JaxbBuilderTest.java} %build -%mvn_build -s +%mvn_build -s -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install %mvn_install @@ -129,6 +129,9 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %files placeholders -f .mfiles-xmlunit-placeholders %changelog +* Tue Feb 20 2024 Marian Koncek - 2.9.0-8 +- Update Java source/target to 1.8 + * Sat Jan 27 2024 Fedora Release Engineering - 2.9.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 399b07b4f119cac19e53ba88e9131b105e384f90 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 21 Feb 2024 10:02:03 +0100 Subject: [PATCH 16/37] Fix Java version properties --- xmlunit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlunit.spec b/xmlunit.spec index e554e9d..c6bf63f 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -112,7 +112,7 @@ rm -r xmlunit-core/src/main/java/org/xmlunit/builder/javax_jaxb\ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder.java,JaxbBuilderTest.java} %build -%mvn_build -s -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 +%mvn_build -s -- -Dmaven.compile.source=1.8 -Dmaven.compile.target=1.8 %install %mvn_install From 42e86b34890d8230ebc3728965be3cdad1fab631 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 23 Feb 2024 14:42:36 +0100 Subject: [PATCH 17/37] bump of release for for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 We are sorry, we messed a bit, and we have to bump release in this package --- xmlunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlunit.spec b/xmlunit.spec index c6bf63f..499d4a7 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -2,7 +2,7 @@ Name: xmlunit Version: 2.9.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Provides classes to do asserts on xml # The whole package is ASL 2.0 except for xmlunit-legacy which is BSD License: Apache-2.0 @@ -129,6 +129,9 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %files placeholders -f .mfiles-xmlunit-placeholders %changelog +* Fri Feb 23 2024 Jiri Vanek - 2.9.0-9 +- bump of release for for java-21-openjdk as system jdk + * Tue Feb 20 2024 Marian Koncek - 2.9.0-8 - Update Java source/target to 1.8 From 634d619143c9d656b4e70b73e64587feea839377 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 18:36:59 +0100 Subject: [PATCH 18/37] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- xmlunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlunit.spec b/xmlunit.spec index 499d4a7..e8f7eaf 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -2,7 +2,7 @@ Name: xmlunit Version: 2.9.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Provides classes to do asserts on xml # The whole package is ASL 2.0 except for xmlunit-legacy which is BSD License: Apache-2.0 @@ -129,6 +129,9 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %files placeholders -f .mfiles-xmlunit-placeholders %changelog +* Tue Feb 27 2024 Jiri Vanek - 2.9.0-10 +- Rebuilt for java-21-openjdk as system jdk + * Fri Feb 23 2024 Jiri Vanek - 2.9.0-9 - bump of release for for java-21-openjdk as system jdk From 7f26ada706c6911df0e81cac97f5a8f7a9d64c56 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 2 Mar 2024 13:56:22 +0100 Subject: [PATCH 19/37] bump of release for for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 We are sorry, we messed a bit, and we have to bump release in this package --- xmlunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlunit.spec b/xmlunit.spec index e8f7eaf..b1ed461 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -2,7 +2,7 @@ Name: xmlunit Version: 2.9.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Provides classes to do asserts on xml # The whole package is ASL 2.0 except for xmlunit-legacy which is BSD License: Apache-2.0 @@ -129,6 +129,9 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %files placeholders -f .mfiles-xmlunit-placeholders %changelog +* Sat Mar 02 2024 Jiri Vanek - 2.9.0-11 +- bump of release for for java-21-openjdk as system jdk + * Tue Feb 27 2024 Jiri Vanek - 2.9.0-10 - Rebuilt for java-21-openjdk as system jdk From 792311768e73017fdd7c9a13686192d88b22c9ae Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 8 Apr 2024 13:26:36 +0200 Subject: [PATCH 20/37] Update to upstream version 2.9.1 --- .gitignore | 1 + 0003-Drop-support-for-JAXB.patch | 19 +++++++------------ sources | 2 +- xmlunit.spec | 8 ++++++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 7c337b9..580173f 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /xmlunit-2.8.2-src.tar.gz /xmlunit-2.8.2.tar.gz /xmlunit-2.9.0.tar.gz +/xmlunit-2.9.1.tar.gz diff --git a/0003-Drop-support-for-JAXB.patch b/0003-Drop-support-for-JAXB.patch index eb852e3..f880702 100644 --- a/0003-Drop-support-for-JAXB.patch +++ b/0003-Drop-support-for-JAXB.patch @@ -4,22 +4,17 @@ Date: Tue, 5 Nov 2019 12:14:08 +0100 Subject: [PATCH 3/3] Drop support for JAXB --- - xmlunit-core/src/main/java/org/xmlunit/builder/Input.java | 6 +++--- + xmlunit-core/src/main/java/org/xmlunit/builder/Input.java | 4 ++-- .../src/test/java/org/xmlunit/builder/InputTest.java | 7 ------- - 2 files changed, 3 insertions(+), 10 deletions(-) + 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 157aa7d..d158141 100644 +index a7a23ee..6f91f32 100644 --- a/xmlunit-core/src/main/java/org/xmlunit/builder/Input.java +++ b/xmlunit-core/src/main/java/org/xmlunit/builder/Input.java -@@ -149,12 +149,12 @@ public class Input { - } - return xml; - } -- -+ - /** - * Build a Source from a Jaxb-Object. +@@ -162,8 +162,8 @@ public class Input { + * @param jaxbObject the object to use as source + * @return a new builder */ - public static JaxbBuilder fromJaxb(Object jaxbObject) { - return JaxbBuilderFactoryLocator.getFactory().create(jaxbObject); @@ -61,5 +56,5 @@ index e767f38..98e3fe7 100644 try (FileInputStream is = new FileInputStream(TestResources.ANIMAL_FILE)) { allIsWellFor(Input.from(is).build()); -- -2.37.2 +2.44.0 diff --git a/sources b/sources index 04f0f9a..c7f3473 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlunit-2.9.0.tar.gz) = ac00537052e6947a14ac44e69f236286dab8b62907d3357953421a9533dc32aac6d92ab8176bccfc0e4a116c7397eb85539b9b6e13a6c7aa12cf9aa8106f426d +SHA512 (xmlunit-2.9.1.tar.gz) = 99e75ab05eae03d77cbe780893f3f38bb5b74f6c29391dc525c7eb882331973109be8e37580404313df300fe5d374475867df1334291a0351ee80357540c0a6e diff --git a/xmlunit.spec b/xmlunit.spec index b1ed461..2761876 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: xmlunit -Version: 2.9.0 -Release: 11%{?dist} +Version: 2.9.1 +Release: 1%{?dist} Summary: Provides classes to do asserts on xml # The whole package is ASL 2.0 except for xmlunit-legacy which is BSD License: Apache-2.0 @@ -102,6 +102,7 @@ rm -r xmlunit-core/src/main/java/org/xmlunit/builder/javax_jaxb\ %pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin %pom_remove_plugin :maven-assembly-plugin %pom_remove_plugin -r :maven-shade-plugin +%pom_remove_plugin -r org.cyclonedx:cyclonedx-maven-plugin %mvn_alias org.xmlunit:xmlunit-legacy xmlunit:xmlunit %mvn_alias org.xmlunit:xmlunit-assertj3 org.xmlunit:xmlunit-assertj @@ -129,6 +130,9 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %files placeholders -f .mfiles-xmlunit-placeholders %changelog +* Mon Apr 08 2024 Marian Koncek - 2.9.1-1 +- Update to upstream version 2.9.1 + * Sat Mar 02 2024 Jiri Vanek - 2.9.0-11 - bump of release for for java-21-openjdk as system jdk From d9f99cd67d586c877dc0918a35cb55ba7835e93a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:14:58 +0000 Subject: [PATCH 21/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xmlunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlunit.spec b/xmlunit.spec index 2761876..03af970 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -2,7 +2,7 @@ Name: xmlunit Version: 2.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Provides classes to do asserts on xml # The whole package is ASL 2.0 except for xmlunit-legacy which is BSD License: Apache-2.0 @@ -130,6 +130,9 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %files placeholders -f .mfiles-xmlunit-placeholders %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Apr 08 2024 Marian Koncek - 2.9.1-1 - Update to upstream version 2.9.1 From 58f8663d0736524808e8b667984a090b20847823 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:30 +0200 Subject: [PATCH 22/37] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + ref: f41 execute: how: tmt From 8f4a50de0deaea5dfd051c9d96ae0cb60c49dcea Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:57 +0200 Subject: [PATCH 23/37] Switch from %setup to %autosetup --- xmlunit.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/xmlunit.spec b/xmlunit.spec index 03af970..82e888a 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -79,19 +79,15 @@ Summary: Placeholders for %{name} This package provides %{summary}. %prep -%setup -q -n %{name}-%{version}-src +%autosetup -p1 -C -%patch 1 -p1 -%patch 2 -p1 -%patch 3 -p1 rm -r xmlunit-core/src/main/java/org/xmlunit/builder/javax_jaxb\ xmlunit-core/src/main/java/org/xmlunit/builder/JaxbBuilderFactory.java\ xmlunit-core/src/main/java/org/xmlunit/builder/JaxbBuilderFactoryLocator.java\ xmlunit-core/src/test/java/org/xmlunit/builder/javax_jaxb\ ; -%patch 4 -p1 # Port to hamcrest 2.1 %java_remove_annotations xmlunit-matchers -p org[.]hamcrest[.]Factory From 636aa62141291df83411c089ea30f2561b2d2c0b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Aug 2024 22:13:19 +0200 Subject: [PATCH 24/37] Switch to non-numdered patches --- xmlunit.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xmlunit.spec b/xmlunit.spec index 82e888a..228e2eb 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -15,12 +15,12 @@ Source0: %{name}-%{version}.tar.gz # Remove bundled binaries which cannot be easily verified for licensing Source1: generate-tarball.sh -Patch1: 0001-Disable-tests-requiring-network-access.patch +Patch: 0001-Disable-tests-requiring-network-access.patch # This also solves the problem of tests requiring network. The files that would # be fetched are identical to the local file -Patch2: 0002-Use-local-schema.patch -Patch3: 0003-Drop-support-for-JAXB.patch -Patch4: 0004-Port-to-assertj-core-3.patch +Patch: 0002-Use-local-schema.patch +Patch: 0003-Drop-support-for-JAXB.patch +Patch: 0004-Port-to-assertj-core-3.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap From 11f2831ff988f1019a24a90fbfae75b9db856c36 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:20 +0200 Subject: [PATCH 25/37] Convert to %autorelease and %autochangelog --- changelog | 222 ++++++++++++++++++++++++++++++++++++++++++++++++++ xmlunit.spec | 225 +-------------------------------------------------- 2 files changed, 224 insertions(+), 223 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..141481f --- /dev/null +++ b/changelog @@ -0,0 +1,222 @@ +* Sat Jul 20 2024 Fedora Release Engineering - 2.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Apr 08 2024 Marian Koncek - 2.9.1-1 +- Update to upstream version 2.9.1 + +* Sat Mar 02 2024 Jiri Vanek - 2.9.0-11 +- bump of release for for java-21-openjdk as system jdk + +* Tue Feb 27 2024 Jiri Vanek - 2.9.0-10 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 2.9.0-9 +- bump of release for for java-21-openjdk as system jdk + +* Tue Feb 20 2024 Marian Koncek - 2.9.0-8 +- Update Java source/target to 1.8 + +* Sat Jan 27 2024 Fedora Release Engineering - 2.9.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 2.9.0-6 +- Convert License tag to SPDX format + +* Wed Aug 30 2023 Mikolaj Izdebski - 2.9.0-5 +- Build with Jurand instead of deprecated javapackages-extra + +* Sat Jul 22 2023 Fedora Release Engineering - 2.9.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 2.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Oct 04 2022 Mikolaj Izdebski - 2.9.0-2 +- Fix BuildRequires on javapackages-extra + +* Fri Sep 09 2022 Marian Koncek - 2.9.0-1 +- Update to upstream version 2.9.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 2.8.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Apr 22 2022 Mikolaj Izdebski - 2.8.2-7 +- Disable more tests that require network access + +* Sat Feb 05 2022 Jiri Vanek - 2.8.2-6 +- Rebuilt for java-17-openjdk as system jdk + +* Sat Jan 22 2022 Fedora Release Engineering - 2.8.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 2.8.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 18 2021 Mikolaj Izdebski - 2.8.2-3 +- Clean tarball from content with questionable licensing +- Resolves: rhbz#1973721 + +* Mon May 17 2021 Mikolaj Izdebski - 2.8.2-2 +- Bootstrap build +- Non-bootstrap build + +* Thu Feb 04 2021 Merlin Mathesius - 0:2.7.0-7 +- Update previous patch to use improved version that was merged upstream + +* Fri Jan 29 2021 Merlin Mathesius - 0:2.7.0-6 +- Fix FTBFS by patching ValueAssertTest to adjust for changed format of + mismatched string exception + +* Thu Jan 28 2021 Fedora Release Engineering - 0:2.7.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jan 26 2021 Marian Koncek - 2.8.2-1 +- Update to upstream version 2.8.2 + +* Wed Jul 29 2020 Marian Koncek - 2.7.0-1 +- Update to upstream version 2.7.0 + +* Wed Jul 29 2020 Fedora Release Engineering - 0:2.7.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 20 2020 Mat Booth - 0:2.7.0-3 +- Allow building against JDK 11 + +* Sat Jul 11 2020 Jiri Vanek - 0:2.7.0-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed May 13 2020 Dr. Tilmann Bubeck - 0:2.7.0-1 +- Update to version 2.7.0. + +* Fri Jan 31 2020 Fedora Release Engineering - 0:2.6.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 2.6.3-2 +- Mass rebuild for javapackages-tools 201902 + +* Mon Jul 29 2019 Fabio Valentini - 0:2.6.3-1 +- Update to version 2.6.3. + +* Sat Jul 27 2019 Fedora Release Engineering - 0:1.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Jun 26 2019 Marian Koncek - 2.6.3-1 +- Update to upstream version 2.6.3 + +* Fri May 24 2019 Mikolaj Izdebski - 2.6.2-2 +- Mass rebuild for javapackages-tools 201901 + +* Mon Mar 04 2019 Marian Koncek - 0:2.6.2-1 +- Update to upstream version 2.6.2 + +* Sun Feb 03 2019 Fedora Release Engineering - 0:1.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 0:1.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 0:1.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0:1.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Mar 01 2017 Michael Simacek - 0:1.6-5 +- Install with XMvn + +* Sat Feb 11 2017 Fedora Release Engineering - 0:1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 0:1.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 0:1.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Jan 04 2015 Dr. Tilmann Bubeck - 0:1.6-1 +- update to upstream's xmlunit-1.6 + +* Wed Nov 5 2014 Mikolaj Izdebski - 0:1.5-3 +- Remove workaround for RPM bug #646523 + +* Sun Jun 08 2014 Fedora Release Engineering - 0:1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Oct 11 2013 Dr. Tilmann Bubeck - 0:1.5-1 +- update to upstream's xmlunit-1.5 + +* Fri Sep 27 2013 Mikolaj Izdebski - 0:1.4-4 +- Enable test suite +- Resolves: rhbz#987412 + +* Sun Aug 04 2013 Fedora Release Engineering - 0:1.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jun 12 2013 Stanislav Ochotnicky - 0:1.4-2 +- Update to latest packaging guidelines +- Cleanup BuildRequires + +* Fri Feb 15 2013 Dr. Tilmann Bubeck - 0:1.4-1 +- update to upstream's xmlunit-1.4 + +* Fri Feb 15 2013 Fedora Release Engineering - 0:1.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 0:1.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0:1.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 0:1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Dec 30 2010 Alexander Kurtakov 0:1.3-3 +- Build javadoc only. + +* Thu Dec 30 2010 Alexander Kurtakov 0:1.3-2 +- BR java 1.6 to prevent gcj failure. + +* Thu Dec 30 2010 Alexander Kurtakov 0:1.3-1 +- Update to new upstream. +- Drop gcj. +- Rebuild docs. + +* Thu Mar 11 2010 Peter Lemenkov - 0:1.0-8.3 +- Added missing Requires jpackage-utils + +* Mon Jul 27 2009 Fedora Release Engineering - 0:1.0-8.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Feb 26 2009 Fedora Release Engineering - 0:1.0-7.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.0-6.2 +- drop repotag + +* Tue Feb 19 2008 Fedora Release Engineering - 0:1.0-6jpp.1 +- Autorebuild for GCC 4.3 + +* Thu Jan 17 2008 Permaine Cheung - 0:1.0-5jpp.1 +- Update to the same version as upstream + + Tue Dec 18 2007 Ralph Apel - 0:1.0-5jpp +- Add poms and depmap frags +- Make Vendor, Distribution based on macro +- Add gcj_support option + +* Mon Mar 12 2007 Permaine Cheung - 0:1.0-4jpp.1 +- Add missing BR, patch to build javadoc, and other rpmlint issues + +* Mon May 08 2006 Ralph Apel - 0:1.0-4jpp +- First JPP-1.7 release + +* Thu Aug 26 2004 Ralph Apel - 0:1.0-3jpp +- Build with ant-1.6.2 + +* Wed Dec 17 2003 Paul Nasrat - 0:1.0-2jpp +- Fix license and improved description +- Thanks to Ralph Apel who produced a spec - merged version info + +* Wed Dec 17 2003 Paul Nasrat - 0:1.0-1jpp +- Initial Version diff --git a/xmlunit.spec b/xmlunit.spec index 228e2eb..518f2a1 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -2,7 +2,7 @@ Name: xmlunit Version: 2.9.1 -Release: 2%{?dist} +Release: %autorelease Summary: Provides classes to do asserts on xml # The whole package is ASL 2.0 except for xmlunit-legacy which is BSD License: Apache-2.0 @@ -126,225 +126,4 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %files placeholders -f .mfiles-xmlunit-placeholders %changelog -* Sat Jul 20 2024 Fedora Release Engineering - 2.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Apr 08 2024 Marian Koncek - 2.9.1-1 -- Update to upstream version 2.9.1 - -* Sat Mar 02 2024 Jiri Vanek - 2.9.0-11 -- bump of release for for java-21-openjdk as system jdk - -* Tue Feb 27 2024 Jiri Vanek - 2.9.0-10 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 2.9.0-9 -- bump of release for for java-21-openjdk as system jdk - -* Tue Feb 20 2024 Marian Koncek - 2.9.0-8 -- Update Java source/target to 1.8 - -* Sat Jan 27 2024 Fedora Release Engineering - 2.9.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Sep 01 2023 Mikolaj Izdebski - 2.9.0-6 -- Convert License tag to SPDX format - -* Wed Aug 30 2023 Mikolaj Izdebski - 2.9.0-5 -- Build with Jurand instead of deprecated javapackages-extra - -* Sat Jul 22 2023 Fedora Release Engineering - 2.9.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 2.9.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Oct 04 2022 Mikolaj Izdebski - 2.9.0-2 -- Fix BuildRequires on javapackages-extra - -* Fri Sep 09 2022 Marian Koncek - 2.9.0-1 -- Update to upstream version 2.9.0 - -* Sat Jul 23 2022 Fedora Release Engineering - 2.8.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Apr 22 2022 Mikolaj Izdebski - 2.8.2-7 -- Disable more tests that require network access - -* Sat Feb 05 2022 Jiri Vanek - 2.8.2-6 -- Rebuilt for java-17-openjdk as system jdk - -* Sat Jan 22 2022 Fedora Release Engineering - 2.8.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 2.8.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 18 2021 Mikolaj Izdebski - 2.8.2-3 -- Clean tarball from content with questionable licensing -- Resolves: rhbz#1973721 - -* Mon May 17 2021 Mikolaj Izdebski - 2.8.2-2 -- Bootstrap build -- Non-bootstrap build - -* Thu Feb 04 2021 Merlin Mathesius - 0:2.7.0-7 -- Update previous patch to use improved version that was merged upstream - -* Fri Jan 29 2021 Merlin Mathesius - 0:2.7.0-6 -- Fix FTBFS by patching ValueAssertTest to adjust for changed format of - mismatched string exception - -* Thu Jan 28 2021 Fedora Release Engineering - 0:2.7.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jan 26 2021 Marian Koncek - 2.8.2-1 -- Update to upstream version 2.8.2 - -* Wed Jul 29 2020 Marian Koncek - 2.7.0-1 -- Update to upstream version 2.7.0 - -* Wed Jul 29 2020 Fedora Release Engineering - 0:2.7.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 20 2020 Mat Booth - 0:2.7.0-3 -- Allow building against JDK 11 - -* Sat Jul 11 2020 Jiri Vanek - 0:2.7.0-2 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Wed May 13 2020 Dr. Tilmann Bubeck - 0:2.7.0-1 -- Update to version 2.7.0. - -* Fri Jan 31 2020 Fedora Release Engineering - 0:2.6.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Nov 05 2019 Mikolaj Izdebski - 2.6.3-2 -- Mass rebuild for javapackages-tools 201902 - -* Mon Jul 29 2019 Fabio Valentini - 0:2.6.3-1 -- Update to version 2.6.3. - -* Sat Jul 27 2019 Fedora Release Engineering - 0:1.6-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Jun 26 2019 Marian Koncek - 2.6.3-1 -- Update to upstream version 2.6.3 - -* Fri May 24 2019 Mikolaj Izdebski - 2.6.2-2 -- Mass rebuild for javapackages-tools 201901 - -* Mon Mar 04 2019 Marian Koncek - 0:2.6.2-1 -- Update to upstream version 2.6.2 - -* Sun Feb 03 2019 Fedora Release Engineering - 0:1.6-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 0:1.6-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 0:1.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0:1.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Mar 01 2017 Michael Simacek - 0:1.6-5 -- Install with XMvn - -* Sat Feb 11 2017 Fedora Release Engineering - 0:1.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 0:1.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 0:1.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Jan 04 2015 Dr. Tilmann Bubeck - 0:1.6-1 -- update to upstream's xmlunit-1.6 - -* Wed Nov 5 2014 Mikolaj Izdebski - 0:1.5-3 -- Remove workaround for RPM bug #646523 - -* Sun Jun 08 2014 Fedora Release Engineering - 0:1.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Oct 11 2013 Dr. Tilmann Bubeck - 0:1.5-1 -- update to upstream's xmlunit-1.5 - -* Fri Sep 27 2013 Mikolaj Izdebski - 0:1.4-4 -- Enable test suite -- Resolves: rhbz#987412 - -* Sun Aug 04 2013 Fedora Release Engineering - 0:1.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jun 12 2013 Stanislav Ochotnicky - 0:1.4-2 -- Update to latest packaging guidelines -- Cleanup BuildRequires - -* Fri Feb 15 2013 Dr. Tilmann Bubeck - 0:1.4-1 -- update to upstream's xmlunit-1.4 - -* Fri Feb 15 2013 Fedora Release Engineering - 0:1.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 0:1.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 0:1.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 0:1.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Dec 30 2010 Alexander Kurtakov 0:1.3-3 -- Build javadoc only. - -* Thu Dec 30 2010 Alexander Kurtakov 0:1.3-2 -- BR java 1.6 to prevent gcj failure. - -* Thu Dec 30 2010 Alexander Kurtakov 0:1.3-1 -- Update to new upstream. -- Drop gcj. -- Rebuild docs. - -* Thu Mar 11 2010 Peter Lemenkov - 0:1.0-8.3 -- Added missing Requires jpackage-utils - -* Mon Jul 27 2009 Fedora Release Engineering - 0:1.0-8.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 0:1.0-7.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.0-6.2 -- drop repotag - -* Tue Feb 19 2008 Fedora Release Engineering - 0:1.0-6jpp.1 -- Autorebuild for GCC 4.3 - -* Thu Jan 17 2008 Permaine Cheung - 0:1.0-5jpp.1 -- Update to the same version as upstream - - Tue Dec 18 2007 Ralph Apel - 0:1.0-5jpp -- Add poms and depmap frags -- Make Vendor, Distribution based on macro -- Add gcj_support option - -* Mon Mar 12 2007 Permaine Cheung - 0:1.0-4jpp.1 -- Add missing BR, patch to build javadoc, and other rpmlint issues - -* Mon May 08 2006 Ralph Apel - 0:1.0-4jpp -- First JPP-1.7 release - -* Thu Aug 26 2004 Ralph Apel - 0:1.0-3jpp -- Build with ant-1.6.2 - -* Wed Dec 17 2003 Paul Nasrat - 0:1.0-2jpp -- Fix license and improved description -- Thanks to Ralph Apel who produced a spec - merged version info - -* Wed Dec 17 2003 Paul Nasrat - 0:1.0-1jpp -- Initial Version +%autochangelog From ea0867fd6d5472ba0cda18c431819a55f6ab1e5c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 10:56:11 +0200 Subject: [PATCH 26/37] Update to upstream version 2.10.0 - Resolves: rhbz#2277615 --- .gitignore | 1 + 0001-Disable-tests-requiring-network-access.patch | 6 +++--- 0002-Use-local-schema.patch | 6 +++--- 0003-Drop-support-for-JAXB.patch | 6 +++--- 0004-Port-to-assertj-core-3.patch | 6 +++--- sources | 2 +- xmlunit.spec | 3 +-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 580173f..bdb2cf8 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /xmlunit-2.8.2.tar.gz /xmlunit-2.9.0.tar.gz /xmlunit-2.9.1.tar.gz +/xmlunit-2.10.0.tar.gz diff --git a/0001-Disable-tests-requiring-network-access.patch b/0001-Disable-tests-requiring-network-access.patch index b189276..85b4f05 100644 --- a/0001-Disable-tests-requiring-network-access.patch +++ b/0001-Disable-tests-requiring-network-access.patch @@ -1,7 +1,7 @@ -From e20a29e689eab30408ccf495590d74c207092e3d Mon Sep 17 00:00:00 2001 +From e481d5b31aadaf8c9fc20280665b13ebd74c7d79 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 9 Sep 2022 15:08:45 +0200 -Subject: [PATCH 1/2] Disable tests requiring network access +Subject: [PATCH 1/4] Disable tests requiring network access --- .../java/org/custommonkey/xmlunit/test_AbstractNodeTester.java | 2 +- @@ -63,5 +63,5 @@ index ad63592..cfcc5e2 100644 assertTrue("xsdFile " + xsdFile.getAbsolutePath() + " exists", xsdFile.exists()); -- -2.37.3 +2.46.0 diff --git a/0002-Use-local-schema.patch b/0002-Use-local-schema.patch index eeda0ae..603a1c8 100644 --- a/0002-Use-local-schema.patch +++ b/0002-Use-local-schema.patch @@ -1,7 +1,7 @@ -From 4d3f414382866e26eac672026cb294e5250375b4 Mon Sep 17 00:00:00 2001 +From b5dfe90a1f5ccc2a49d24bbb327c549b5fb85080 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 26 Sep 2022 12:28:11 +0200 -Subject: [PATCH 2/2] Use local schema +Subject: [PATCH 2/4] Use local schema --- test-resources/BookXsdGenerated.xml | 2 +- @@ -46,5 +46,5 @@ index 1d50d5c..5858d00 100644 Jack Canfield Mark Victor Hansen -- -2.37.3 +2.46.0 diff --git a/0003-Drop-support-for-JAXB.patch b/0003-Drop-support-for-JAXB.patch index f880702..4ae2f94 100644 --- a/0003-Drop-support-for-JAXB.patch +++ b/0003-Drop-support-for-JAXB.patch @@ -1,7 +1,7 @@ -From 4b30dd33332f79c71697c8a9bdbf39d74fb06c4a Mon Sep 17 00:00:00 2001 +From 34dc88688ce38468746d1e190a75931225ace80b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 12:14:08 +0100 -Subject: [PATCH 3/3] Drop support for JAXB +Subject: [PATCH 3/4] Drop support for JAXB --- xmlunit-core/src/main/java/org/xmlunit/builder/Input.java | 4 ++-- @@ -56,5 +56,5 @@ index e767f38..98e3fe7 100644 try (FileInputStream is = new FileInputStream(TestResources.ANIMAL_FILE)) { allIsWellFor(Input.from(is).build()); -- -2.44.0 +2.46.0 diff --git a/0004-Port-to-assertj-core-3.patch b/0004-Port-to-assertj-core-3.patch index 48f70ab..4cf654e 100644 --- a/0004-Port-to-assertj-core-3.patch +++ b/0004-Port-to-assertj-core-3.patch @@ -1,7 +1,7 @@ -From 7077eac701bca8e63d16aede77a73474d5fe79af Mon Sep 17 00:00:00 2001 +From a5449bbe527fcafa8a5a8b31a30724a7a2122d96 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 26 Sep 2022 13:53:53 +0200 -Subject: [PATCH] Port to assertj-core 3 +Subject: [PATCH 4/4] Port to assertj-core 3 --- .../src/test/java/org/xmlunit/assertj3/ValueAssertTest.java | 5 ++++- @@ -27,5 +27,5 @@ index fa12a7f..6e7bb55 100644 String xml = ""; -- -2.37.3 +2.46.0 diff --git a/sources b/sources index c7f3473..d02b9bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlunit-2.9.1.tar.gz) = 99e75ab05eae03d77cbe780893f3f38bb5b74f6c29391dc525c7eb882331973109be8e37580404313df300fe5d374475867df1334291a0351ee80357540c0a6e +SHA512 (xmlunit-2.10.0.tar.gz) = 71bf82d2cb268378d0fecd13d31d9ecc175adfcfc2fa1e1249070c06940f8c0dbe8cf1679c6f9de2cddc1ba123aa0ef1c21b9a2ab746b78aea3ab4654775408c diff --git a/xmlunit.spec b/xmlunit.spec index 518f2a1..89caa0b 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: xmlunit -Version: 2.9.1 +Version: 2.10.0 Release: %autorelease Summary: Provides classes to do asserts on xml # The whole package is ASL 2.0 except for xmlunit-legacy which is BSD @@ -27,7 +27,6 @@ BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local BuildRequires: mvn(junit:junit) -BuildRequires: mvn(net.bytebuddy:byte-buddy) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.assertj:assertj-core) BuildRequires: mvn(org.hamcrest:hamcrest-core) From 040ebad41485e7b9d0728327b5945adad51f6336 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:39 +0100 Subject: [PATCH 27/37] Update javapackages test plan to f42 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt From 35814effcf4cfbb2861bf11c590f97af97359d79 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:01:19 +0100 Subject: [PATCH 28/37] Unify spec style with the rest of Java/Maven packages [skip changelog] --- xmlunit.spec | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/xmlunit.spec b/xmlunit.spec index 89caa0b..8616ce3 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -40,41 +40,41 @@ XMLUnit provides you with the tools to verify the XML you emit is the one you want to create. It provides helpers to validate against an XML Schema, assert the values of XPath queries or compare XML documents against expected outcomes. -%package javadoc +%package javadoc Summary: Javadoc for %{name} -%description javadoc +%description javadoc Javadoc for %{name} -%package assertj +%package assertj Summary: Assertj for %{name} -%description assertj +%description assertj This package provides %{summary}. -%package core +%package core Summary: Core package for %{name} -%description core +%description core This package provides %{summary}. -%package legacy +%package legacy Summary: Legacy package for %{name} License: BSD-3-Clause -%description legacy +%description legacy This package provides %{summary}. -%package matchers +%package matchers Summary: Matchers for %{name} -%description matchers +%description matchers This package provides %{summary}. -%package placeholders +%package placeholders Summary: Placeholders for %{name} -%description placeholders +%description placeholders This package provides %{summary}. %prep @@ -118,10 +118,15 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %license LICENSE %files javadoc -f .mfiles-javadoc + %files assertj -f .mfiles-xmlunit-assertj3 + %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 From 891cb336499642b9eac80875f0c5f8ee1839c649 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 17:01:09 +0100 Subject: [PATCH 29/37] Sort dependencies [skip changelog] --- xmlunit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlunit.spec b/xmlunit.spec index 8616ce3..872c575 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -22,6 +22,7 @@ Patch: 0002-Use-local-schema.patch Patch: 0003-Drop-support-for-JAXB.patch Patch: 0004-Port-to-assertj-core-3.patch +BuildRequires: jurand %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else @@ -33,7 +34,6 @@ BuildRequires: mvn(org.hamcrest:hamcrest-core) BuildRequires: mvn(org.hamcrest:hamcrest-library) BuildRequires: mvn(org.mockito:mockito-core) %endif -BuildRequires: jurand %description XMLUnit provides you with the tools to verify the XML you emit is the one you From 04519d6e7a8d790f879db66eb642aafdfc6352fa Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:11 +0100 Subject: [PATCH 30/37] Update javadoc package description [skip changelog] --- xmlunit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmlunit.spec b/xmlunit.spec index 872c575..b84b1b7 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -41,10 +41,10 @@ want to create. It provides helpers to validate against an XML Schema, assert the values of XPath queries or compare XML documents against expected outcomes. %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc -Javadoc for %{name} +API documentation for %{name}. %package assertj Summary: Assertj for %{name} From c1f825c530c7d4b75bbf5eba81ba0367e0a16c14 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:03:06 +0000 Subject: [PATCH 31/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 1b11d124278b1eb3b985179db4aeb247dc8fea16 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:14 +0100 Subject: [PATCH 32/37] Remove javadoc subpackage --- xmlunit.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/xmlunit.spec b/xmlunit.spec index b84b1b7..097f0dc 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -34,18 +34,14 @@ BuildRequires: mvn(org.hamcrest:hamcrest-core) BuildRequires: mvn(org.hamcrest:hamcrest-library) BuildRequires: mvn(org.mockito:mockito-core) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 2.10.0-8 %description XMLUnit provides you with the tools to verify the XML you emit is the one you want to create. It provides helpers to validate against an XML Schema, assert the values of XPath queries or compare XML documents against expected outcomes. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %package assertj Summary: Assertj for %{name} @@ -108,7 +104,7 @@ rm -r xmlunit-core/src/main/java/org/xmlunit/builder/javax_jaxb\ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder.java,JaxbBuilderTest.java} %build -%mvn_build -s -- -Dmaven.compile.source=1.8 -Dmaven.compile.target=1.8 +%mvn_build -j -s -- -Dmaven.compile.source=1.8 -Dmaven.compile.target=1.8 %install %mvn_install @@ -117,8 +113,6 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %doc README.md CONTRIBUTING.md RELEASE_NOTES.md %license LICENSE -%files javadoc -f .mfiles-javadoc - %files assertj -f .mfiles-xmlunit-assertj3 %files core -f .mfiles-xmlunit-core From 2cadf3b1fb6653b4ffffaf4cadbfa17a87feaa93 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 33/37] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From eced09baf2c4d8aae3c9706f51e51331d9494d71 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:32 +0200 Subject: [PATCH 34/37] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From c502929bf83c601cd4626759e5672126d600c140 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:52 +0200 Subject: [PATCH 35/37] Build with OpenJDK 25 --- xmlunit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlunit.spec b/xmlunit.spec index 097f0dc..511433a 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -26,7 +26,7 @@ BuildRequires: jurand %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.assertj:assertj-core) From b57df37f9bca009454df1902ddecda06c0749247 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:56:55 +0000 Subject: [PATCH 36/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 7771beb8b2726ad168e5804f034d5ad0d98047f8 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 01:34:46 +0200 Subject: [PATCH 37/37] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that.