From 1b11d124278b1eb3b985179db4aeb247dc8fea16 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 3 Mar 2025 11:57:14 +0100
Subject: [PATCH 1/6] 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 <mizdebsk@redhat.com>
Date: Wed, 26 Mar 2025 08:43:19 +0100
Subject: [PATCH 2/6] 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 <mizdebsk@redhat.com>
Date: Thu, 22 May 2025 13:35:32 +0200
Subject: [PATCH 3/6] 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 <mizdebsk@redhat.com>
Date: Sun, 13 Jul 2025 09:22:52 +0200
Subject: [PATCH 4/6] 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 <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 20:56:55 +0000
Subject: [PATCH 5/6] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From 7771beb8b2726ad168e5804f034d5ad0d98047f8 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Wed, 30 Jul 2025 01:34:46 +0200
Subject: [PATCH 6/6] 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.