Rebuilt for java-21-openjdk as system jdk

https://fedoraproject.org/wiki/Changes/Java21
bump of release for for java-21-openjdk as system jdk
2024-03-02 21:48:41 +01:00 · 2024-03-02 13:57:12 +01:00 · 2024-03-02 12:47:25 +01:00 · 2024-03-02 12:47:23 +01:00 · 2024-03-01 13:43:10 +01:00
9 changed files with 274 additions and 273 deletions
--- a/.gitignore
+++ b/.gitignore
@ -12,5 +12,3 @@
 /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
-/xmlunit-2.10.0.tar.gz
--- a/0001-Disable-tests-requiring-network-access.patch
+++ b/0001-Disable-tests-requiring-network-access.patch
@ -1,7 +1,7 @@
-From e481d5b31aadaf8c9fc20280665b13ebd74c7d79 Mon Sep 17 00:00:00 2001
+From e20a29e689eab30408ccf495590d74c207092e3d Mon Sep 17 00:00:00 2001
 From: Marian Koncek <mkoncek@redhat.com>
 Date: Fri, 9 Sep 2022 15:08:45 +0200
-Subject: [PATCH 1/4] Disable tests requiring network access
+Subject: [PATCH 1/2] 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.46.0
+2.37.3

--- a/0002-Use-local-schema.patch
+++ b/0002-Use-local-schema.patch
@ -1,7 +1,7 @@
-From b5dfe90a1f5ccc2a49d24bbb327c549b5fb85080 Mon Sep 17 00:00:00 2001
+From 4d3f414382866e26eac672026cb294e5250375b4 Mon Sep 17 00:00:00 2001
 From: Marian Koncek <mkoncek@redhat.com>
 Date: Mon, 26 Sep 2022 12:28:11 +0200
-Subject: [PATCH 2/4] Use local schema
+Subject: [PATCH 2/2] Use local schema

 ---
 test-resources/BookXsdGenerated.xml            | 2 +-
@ -46,5 +46,5 @@ index 1d50d5c..5858d00 100644
     <Author>Jack Canfield</Author>
     <Author>Mark Victor Hansen</Author>
 -- 
-2.46.0
+2.37.3

--- a/0003-Drop-support-for-JAXB.patch
+++ b/0003-Drop-support-for-JAXB.patch
@ -1,20 +1,25 @@
-From 34dc88688ce38468746d1e190a75931225ace80b Mon Sep 17 00:00:00 2001
+From 4b30dd33332f79c71697c8a9bdbf39d74fb06c4a Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Tue, 5 Nov 2019 12:14:08 +0100
-Subject: [PATCH 3/4] Drop support for JAXB
+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 a7a23ee..6f91f32 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
-@@ -162,8 +162,8 @@ public class Input {
-      * @param jaxbObject the object to use as source
-      * @return a new builder
+@@ -149,12 +149,12 @@ public class Input {
+         }
+         return xml;
+     }
+-    
+
+     /**
+      * Build a Source from a Jaxb-Object.
      */
 -    public static JaxbBuilder fromJaxb(Object jaxbObject) {
 -        return JaxbBuilderFactoryLocator.getFactory().create(jaxbObject);
@ -56,5 +61,5 @@ index e767f38..98e3fe7 100644
         try (FileInputStream is = new FileInputStream(TestResources.ANIMAL_FILE)) {
             allIsWellFor(Input.from(is).build());
 -- 
-2.46.0
+2.37.2

--- a/0004-Port-to-assertj-core-3.patch
+++ b/0004-Port-to-assertj-core-3.patch
@ -1,7 +1,7 @@
-From a5449bbe527fcafa8a5a8b31a30724a7a2122d96 Mon Sep 17 00:00:00 2001
+From 7077eac701bca8e63d16aede77a73474d5fe79af Mon Sep 17 00:00:00 2001
 From: Marian Koncek <mkoncek@redhat.com>
 Date: Mon, 26 Sep 2022 13:53:53 +0200
-Subject: [PATCH 4/4] Port to assertj-core 3
+Subject: [PATCH] Port to assertj-core 3

 ---
 .../src/test/java/org/xmlunit/assertj3/ValueAssertTest.java  | 5 ++++-
@ -27,5 +27,5 @@ index fa12a7f..6e7bb55 100644
 
         String xml = "<a><b attr=\"abc\"></b></a>";
 -- 
-2.46.0
+2.37.3

--- a/222
+++ b/222
@ -1,222 +0,0 @@
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Mon Apr 08 2024 Marian Koncek <mkoncek@redhat.com> - 2.9.1-1
- Update to upstream version 2.9.1
-
-* Sat Mar 02 2024 Jiri Vanek <jvanek@redhat.com> - 2.9.0-11
- bump of release for for java-21-openjdk as system jdk
-
-* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 2.9.0-10
- Rebuilt for java-21-openjdk as system jdk
-
-* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 2.9.0-9
- bump of release for for java-21-openjdk as system jdk
-
-* Tue Feb 20 2024 Marian Koncek <mkoncek@redhat.com> - 2.9.0-8
- Update Java source/target to 1.8
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.9.0-6
- Convert License tag to SPDX format
-
-* Wed Aug 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.9.0-5
- Build with Jurand instead of deprecated javapackages-extra
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Oct 04 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.9.0-2
- Fix BuildRequires on javapackages-extra
-
-* Fri Sep 09 2022 Marian Koncek <mkoncek@redhat.com> - 2.9.0-1
- Update to upstream version 2.9.0
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Apr 22 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.8.2-7
- Disable more tests that require network access
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.8.2-6
- Rebuilt for java-17-openjdk as system jdk
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jun 18 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.8.2-3
- Clean tarball from content with questionable licensing
- Resolves: rhbz#1973721
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.8.2-2
- Bootstrap build
- Non-bootstrap build
-
-* Thu Feb 04 2021 Merlin Mathesius <mmathesi@redhat.com> - 0:2.7.0-7
- Update previous patch to use improved version that was merged upstream
-
-* Fri Jan 29 2021 Merlin Mathesius <mmathesi@redhat.com> - 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 <releng@fedoraproject.org> - 0:2.7.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jan 26 2021 Marian Koncek <mkoncek@redhat.com> - 2.8.2-1
- Update to upstream version 2.8.2
-
-* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 2.7.0-1
- Update to upstream version 2.7.0
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.7.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 20 2020 Mat Booth <mat.booth@redhat.com> - 0:2.7.0-3
- Allow building against JDK 11
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 0:2.7.0-2
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Wed May 13 2020 Dr. Tilmann Bubeck <bubeck@fedoraproject.org> - 0:2.7.0-1
- Update to version 2.7.0.
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.6.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.3-2
- Mass rebuild for javapackages-tools 201902
-
-* Mon Jul 29 2019 Fabio Valentini <decathorpe@gmail.com> - 0:2.6.3-1
- Update to version 2.6.3.
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.6-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Jun 26 2019 Marian Koncek <mkoncek@redhat.com> - 2.6.3-1
- Update to upstream version 2.6.3
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.2-2
- Mass rebuild for javapackages-tools 201901
-
-* Mon Mar 04 2019 Marian Koncek <mkoncek@redhat.com> - 0:2.6.2-1
- Update to upstream version 2.6.2
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.6-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.6-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.6-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.6-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Wed Mar 01 2017 Michael Simacek <msimacek@redhat.com> - 0:1.6-5
- Install with XMvn
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sun Jan 04 2015 Dr. Tilmann Bubeck <tilmann@bubecks.de> - 0:1.6-1
- update to upstream's xmlunit-1.6
-
-* Wed Nov  5 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.5-3
- Remove workaround for RPM bug #646523
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Fri Oct 11 2013 Dr. Tilmann Bubeck <tilmann@bubecks.de> - 0:1.5-1
- update to upstream's xmlunit-1.5
-
-* Fri Sep 27 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.4-4
- Enable test suite
- Resolves: rhbz#987412
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Jun 12 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.4-2
- Update to latest packaging guidelines
- Cleanup BuildRequires
-
-* Fri Feb 15 2013 Dr. Tilmann Bubeck <t.bubeck@reinform.de> - 0:1.4-1
- update to upstream's xmlunit-1.4
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Thu Dec 30 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.3-3
- Build javadoc only.
-
-* Thu Dec 30 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.3-2
- BR java 1.6 to prevent gcj failure.
-
-* Thu Dec 30 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.3-1
- Update to new upstream.
- Drop gcj.
- Rebuild docs.
-
-* Thu Mar 11 2010 Peter Lemenkov <lemenkov@gmail.com> - 0:1.0-8.3
- Added missing Requires jpackage-utils
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.0-8.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.0-7.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:1.0-6.2
- drop repotag
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0:1.0-6jpp.1
- Autorebuild for GCC 4.3
-
-* Thu Jan 17 2008 Permaine Cheung <pcheung@redhat.com> - 0:1.0-5jpp.1
- Update to the same version as upstream
-
- Tue Dec 18 2007 Ralph Apel <r.apel at r-apel.de> - 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 <pcheung@redhat.com> - 0:1.0-4jpp.1
- Add missing BR, patch to build javadoc, and other rpmlint issues
-
-* Mon May 08 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.0-4jpp
- First JPP-1.7 release
-
-* Thu Aug 26 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-3jpp
- Build with ant-1.6.2
-
-* Wed Dec 17 2003 Paul Nasrat <pauln at truemesh.com> - 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 <pauln at truemesh.com> - 0:1.0-1jpp
- Initial Version
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@ -1,7 +1,7 @@
 summary: Run javapackages-specific tests
 discover:
  how: fmf
-  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
-  ref: f43
+  url: https://src.fedoraproject.org/tests/javapackages
+  ref: f40
 execute:
  how: tmt
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (xmlunit-2.10.0.tar.gz) = 71bf82d2cb268378d0fecd13d31d9ecc175adfcfc2fa1e1249070c06940f8c0dbe8cf1679c6f9de2cddc1ba123aa0ef1c21b9a2ab746b78aea3ab4654775408c
+SHA512 (xmlunit-2.9.0.tar.gz) = ac00537052e6947a14ac44e69f236286dab8b62907d3357953421a9533dc32aac6d92ab8176bccfc0e4a116c7397eb85539b9b6e13a6c7aa12cf9aa8106f426d
--- a/xmlunit.spec
+++ b/xmlunit.spec
@ -1,8 +1,8 @@
 %bcond_with bootstrap

 Name:           xmlunit
-Version:        2.10.0
-Release:        %autorelease
+Version:        2.9.0
+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
@ -15,74 +15,83 @@ Source0:        %{name}-%{version}.tar.gz
 # Remove bundled binaries which cannot be easily verified for licensing
 Source1:        generate-tarball.sh

-Patch:          0001-Disable-tests-requiring-network-access.patch
+Patch1:         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
-Patch:          0002-Use-local-schema.patch
-Patch:          0003-Drop-support-for-JAXB.patch
-Patch:          0004-Port-to-assertj-core-3.patch
+Patch2:         0002-Use-local-schema.patch
+Patch3:         0003-Drop-support-for-JAXB.patch
+Patch4:         0004-Port-to-assertj-core-3.patch

-BuildRequires:  jurand
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  maven-local-openjdk25
+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)
 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
+BuildRequires:  jurand

 %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 assertj
+%package        javadoc
+Summary:        Javadoc for %{name}
+
+%description    javadoc
+Javadoc for %{name}
+
+%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
-%autosetup -p1 -C
+%setup -q -n %{name}-%{version}-src

+%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
@ -93,7 +102,6 @@ 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
@ -104,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 -j -s -- -Dmaven.compile.source=1.8 -Dmaven.compile.target=1.8
+%mvn_build -s -- -Dmaven.compile.source=1.8 -Dmaven.compile.target=1.8

 %install
 %mvn_install
@ -113,15 +121,227 @@ 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
-
 %files legacy -f .mfiles-xmlunit-legacy
-
 %files matchers -f .mfiles-xmlunit-matchers
-
 %files placeholders -f .mfiles-xmlunit-placeholders

 %changelog
-%autochangelog
+* Sat Mar 02 2024 Jiri Vanek <jvanek@redhat.com> - 2.9.0-11
+- Rebuilt for java-21-openjdk as system jdk
+
+* Sat Mar 02 2024 Jiri Vanek <jvanek@redhat.com> - 2.9.0-10
+- bump of release for for java-21-openjdk as system jdk
+
+* Sat Mar 02 2024 Marian Koncek <mkoncek@redhat.com> - 2.9.0-9
+- Update Java source/target to 1.8
+
+* Fri Mar 01 2024 Jiri Vanek <jvanek@redhat.com> - 2.9.0-8
+- bump of release for for java-21-openjdk as system jdk
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.9.0-6
+- Convert License tag to SPDX format
+
+* Wed Aug 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.9.0-5
+- Build with Jurand instead of deprecated javapackages-extra
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Oct 04 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.9.0-2
+- Fix BuildRequires on javapackages-extra
+
+* Fri Sep 09 2022 Marian Koncek <mkoncek@redhat.com> - 2.9.0-1
+- Update to upstream version 2.9.0
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Apr 22 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.8.2-7
+- Disable more tests that require network access
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.8.2-6
+- Rebuilt for java-17-openjdk as system jdk
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 18 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.8.2-3
+- Clean tarball from content with questionable licensing
+- Resolves: rhbz#1973721
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.8.2-2
+- Bootstrap build
+- Non-bootstrap build
+
+* Thu Feb 04 2021 Merlin Mathesius <mmathesi@redhat.com> - 0:2.7.0-7
+- Update previous patch to use improved version that was merged upstream
+
+* Fri Jan 29 2021 Merlin Mathesius <mmathesi@redhat.com> - 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 <releng@fedoraproject.org> - 0:2.7.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jan 26 2021 Marian Koncek <mkoncek@redhat.com> - 2.8.2-1
+- Update to upstream version 2.8.2
+
+* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 2.7.0-1
+- Update to upstream version 2.7.0
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.7.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 20 2020 Mat Booth <mat.booth@redhat.com> - 0:2.7.0-3
+- Allow building against JDK 11
+
+* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 0:2.7.0-2
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Wed May 13 2020 Dr. Tilmann Bubeck <bubeck@fedoraproject.org> - 0:2.7.0-1
+- Update to version 2.7.0.
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.6.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.3-2
+- Mass rebuild for javapackages-tools 201902
+
+* Mon Jul 29 2019 Fabio Valentini <decathorpe@gmail.com> - 0:2.6.3-1
+- Update to version 2.6.3.
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.6-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Jun 26 2019 Marian Koncek <mkoncek@redhat.com> - 2.6.3-1
+- Update to upstream version 2.6.3
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.2-2
+- Mass rebuild for javapackages-tools 201901
+
+* Mon Mar 04 2019 Marian Koncek <mkoncek@redhat.com> - 0:2.6.2-1
+- Update to upstream version 2.6.2
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.6-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.6-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.6-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.6-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Wed Mar 01 2017 Michael Simacek <msimacek@redhat.com> - 0:1.6-5
+- Install with XMvn
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sun Jan 04 2015 Dr. Tilmann Bubeck <tilmann@bubecks.de> - 0:1.6-1
+- update to upstream's xmlunit-1.6
+
+* Wed Nov  5 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.5-3
+- Remove workaround for RPM bug #646523
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri Oct 11 2013 Dr. Tilmann Bubeck <tilmann@bubecks.de> - 0:1.5-1
+- update to upstream's xmlunit-1.5
+
+* Fri Sep 27 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.4-4
+- Enable test suite
+- Resolves: rhbz#987412
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Jun 12 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.4-2
+- Update to latest packaging guidelines
+- Cleanup BuildRequires
+
+* Fri Feb 15 2013 Dr. Tilmann Bubeck <t.bubeck@reinform.de> - 0:1.4-1
+- update to upstream's xmlunit-1.4
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Thu Dec 30 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.3-3
+- Build javadoc only.
+
+* Thu Dec 30 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.3-2
+- BR java 1.6 to prevent gcj failure.
+
+* Thu Dec 30 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.3-1
+- Update to new upstream.
+- Drop gcj.
+- Rebuild docs.
+
+* Thu Mar 11 2010 Peter Lemenkov <lemenkov@gmail.com> - 0:1.0-8.3
+- Added missing Requires jpackage-utils
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.0-8.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.0-7.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:1.0-6.2
+- drop repotag
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0:1.0-6jpp.1
+- Autorebuild for GCC 4.3
+
+* Thu Jan 17 2008 Permaine Cheung <pcheung@redhat.com> - 0:1.0-5jpp.1
+- Update to the same version as upstream
+
+ Tue Dec 18 2007 Ralph Apel <r.apel at r-apel.de> - 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 <pcheung@redhat.com> - 0:1.0-4jpp.1
+- Add missing BR, patch to build javadoc, and other rpmlint issues
+
+* Mon May 08 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.0-4jpp
+- First JPP-1.7 release
+
+* Thu Aug 26 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-3jpp
+- Build with ant-1.6.2
+
+* Wed Dec 17 2003 Paul Nasrat <pauln at truemesh.com> - 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 <pauln at truemesh.com> - 0:1.0-1jpp
+- Initial Version
Author	SHA1	Message	Date
Jiri	724e9ff958	Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21	2024-03-02 21:48:41 +01:00
Jiri	71cabc030c	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	2024-03-02 13:57:12 +01:00
Marian Koncek	6dda440107	Fix Java version properties	2024-03-02 12:47:25 +01:00
Marian Koncek	9525ffd028	Update Java source/target to 1.8	2024-03-02 12:47:23 +01:00
Jiri Vanek	223426fc4c	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	2024-03-01 13:43:10 +01:00