From 367e9c80c5dcfe7e6a254927b0b7024cb7eef90a Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 22 Feb 2024 05:34:02 +0100
Subject: [PATCH 01/33] Switch to Java 21 for runtime

---
 0001-Use-OpenJDK-21.patch                     | 25 +++++++++++++++++++
 ...le-JPMS-provides-and-JAR-transformer.patch |  8 +++---
 tests/smoke/main.fmf                          |  2 +-
 tests/smoke/runtest.sh                        |  2 +-
 xmvn-generator.spec                           | 13 +++++++---
 5 files changed, 40 insertions(+), 10 deletions(-)
 create mode 100644 0001-Use-OpenJDK-21.patch
 rename 0001-Enable-JPMS-provides-and-JAR-transformer.patch => 0002-Enable-JPMS-provides-and-JAR-transformer.patch (85%)

diff --git a/0001-Use-OpenJDK-21.patch b/0001-Use-OpenJDK-21.patch
new file mode 100644
index 0000000..a33b9b8
--- /dev/null
+++ b/0001-Use-OpenJDK-21.patch
@@ -0,0 +1,25 @@
+From 089eacff83657ad118c1348ef521e46dc18645df Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Thu, 22 Feb 2024 05:30:33 +0100
+Subject: [PATCH 1/2] Use OpenJDK 21
+
+---
+ src/main/rpm/macros.xmvngen | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main/rpm/macros.xmvngen b/src/main/rpm/macros.xmvngen
+index 4ff3f22..0b124f4 100644
+--- a/src/main/rpm/macros.xmvngen
++++ b/src/main/rpm/macros.xmvngen
+@@ -3,7 +3,7 @@
+ %__xmvngen_debug %{nil}
+ 
+ # Path to JVM library (libjvm.so).  Java 17 or newer is required.
+-%__xmvngen_libjvm %{_jvmdir}/jre-17-openjdk/lib/server/libjvm.so
++%__xmvngen_libjvm %{_jvmdir}/jre-21-openjdk/lib/server/libjvm.so
+ 
+ # Class path of nested JVM.  This should be a colon-separated list of
+ # JARs that contains xmvn-generator.jar, JARs with third-party
+-- 
+2.41.0
+
diff --git a/0001-Enable-JPMS-provides-and-JAR-transformer.patch b/0002-Enable-JPMS-provides-and-JAR-transformer.patch
similarity index 85%
rename from 0001-Enable-JPMS-provides-and-JAR-transformer.patch
rename to 0002-Enable-JPMS-provides-and-JAR-transformer.patch
index 17c840f..48ddd04 100644
--- a/0001-Enable-JPMS-provides-and-JAR-transformer.patch
+++ b/0002-Enable-JPMS-provides-and-JAR-transformer.patch
@@ -1,14 +1,14 @@
-From ab348efccc347d192f582bd926ffa048f33d615c Mon Sep 17 00:00:00 2001
+From 1f80a6d816dc3dde83dc3df0d94d97b8a7f62937 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Wed, 30 Aug 2023 15:53:26 +0200
-Subject: [PATCH] Enable JPMS provides and JAR transformer
+Subject: [PATCH 2/2] Enable JPMS provides and JAR transformer
 
 ---
  src/main/rpm/macros.xmvngen | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/rpm/macros.xmvngen b/src/main/rpm/macros.xmvngen
-index 4ff3f22..ca1e3bb 100644
+index 0b124f4..b1ef101 100644
 --- a/src/main/rpm/macros.xmvngen
 +++ b/src/main/rpm/macros.xmvngen
 @@ -1,6 +1,6 @@
@@ -18,7 +18,7 @@ index 4ff3f22..ca1e3bb 100644
 +%__xmvngen_debug 1
  
  # Path to JVM library (libjvm.so).  Java 17 or newer is required.
- %__xmvngen_libjvm %{_jvmdir}/jre-17-openjdk/lib/server/libjvm.so
+ %__xmvngen_libjvm %{_jvmdir}/jre-21-openjdk/lib/server/libjvm.so
 @@ -15,7 +15,7 @@
  # generator factories (classes implementing GeneratorFactory interface).
  # Available hook factories are:
diff --git a/tests/smoke/main.fmf b/tests/smoke/main.fmf
index d35e96d..3071e5f 100644
--- a/tests/smoke/main.fmf
+++ b/tests/smoke/main.fmf
@@ -4,4 +4,4 @@ description: |
 require:
   - rpm-build
   - javapackages-local
-  - java-17-openjdk-devel
+  - java-21-openjdk-devel
diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh
index 735ebd6..2805b54 100755
--- a/tests/smoke/runtest.sh
+++ b/tests/smoke/runtest.sh
@@ -8,7 +8,7 @@ rlJournalStart
     rlAssertRpm xmvn-generator
     rlAssertRpm javapackages-local
     rlAssertRpm rpm-build
-    rlAssertRpm java-17-openjdk-devel
+    rlAssertRpm java-21-openjdk-devel
   rlPhaseEnd
 
   rlPhaseStartTest
diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index 9b12c09..692bcc1 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -3,7 +3,7 @@
 
 Name:           xmvn-generator
 Version:        1.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        RPM dependency generator for Java
 License:        Apache-2.0
 URL:            https://github.com/fedora-java/xmvn-generator
@@ -11,7 +11,8 @@ ExclusiveArch:  %{java_arches}
 
 Source0:        https://github.com/fedora-java/xmvn-generator/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
-Patch0:         0001-Enable-JPMS-provides-and-JAR-transformer.patch
+Patch0:         0001-Use-OpenJDK-21.patch
+Patch1:         0002-Enable-JPMS-provides-and-JAR-transformer.patch
 
 BuildRequires:  gcc
 BuildRequires:  rpm-devel
@@ -28,7 +29,7 @@ BuildRequires:  mvn(org.ow2.asm:asm)
 
 Requires:       rpm-build
 Requires:       lujavrite
-Requires:       java-17-openjdk-headless
+Requires:       java-21-openjdk-headless
 
 %description
 XMvn Generator is a dependency generator for RPM Package Manager
@@ -39,8 +40,9 @@ from Lua.
 
 %prep
 %setup -q
-%if !0%{?fedora}
 %patch0 -p1
+%if !0%{?fedora}
+%patch1 -p1
 %endif
 %mvn_file : %{name}
 
@@ -63,6 +65,9 @@ install -D -p -m 644 src/main/rpm/xmvngen.attr %{buildroot}%{_fileattrsdir}/xmvn
 %doc README.md
 
 %changelog
+* Thu Feb 22 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.2-3
+- Switch to Java 21 for runtime
+
 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From cc4e5037ee663ce9f30fb769ce96c0e9a67d077f Mon Sep 17 00:00:00 2001
From: Software Management Team <packaging-team-maint@redhat.com>
Date: Thu, 30 May 2024 12:46:50 +0200
Subject: [PATCH 02/33] Eliminate use of obsolete %patchN syntax (#2283636)

---
 xmvn-generator.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index 692bcc1..b9f8003 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -40,9 +40,9 @@ from Lua.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch -P0 -p1
 %if !0%{?fedora}
-%patch1 -p1
+%patch -P1 -p1
 %endif
 %mvn_file : %{name}
 

From b3341398089853e6a5e004f9cb5bfc81c2708499 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 31 May 2024 05:41:47 +0200
Subject: [PATCH 03/33] Switch to a newer %patch syntax

---
 xmvn-generator.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index b9f8003..b404d6a 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -3,7 +3,7 @@
 
 Name:           xmvn-generator
 Version:        1.2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        RPM dependency generator for Java
 License:        Apache-2.0
 URL:            https://github.com/fedora-java/xmvn-generator
@@ -40,9 +40,9 @@ from Lua.
 
 %prep
 %setup -q
-%patch -P0 -p1
+%patch 0 -p1
 %if !0%{?fedora}
-%patch -P1 -p1
+%patch 1 -p1
 %endif
 %mvn_file : %{name}
 
@@ -65,6 +65,9 @@ install -D -p -m 644 src/main/rpm/xmvngen.attr %{buildroot}%{_fileattrsdir}/xmvn
 %doc README.md
 
 %changelog
+* Fri May 31 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.2-4
+- Switch to a newer patch macro syntax
+
 * Thu Feb 22 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.2-3
 - Switch to Java 21 for runtime
 

From 23ea3055ae41d64c84f2ad0ff859b3c1dc6135fb Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 2 Jul 2024 10:43:33 +0200
Subject: [PATCH 04/33] Update smoke test summary

---
 plans/smoke.fmf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plans/smoke.fmf b/plans/smoke.fmf
index c979bd9..a1e7bfd 100644
--- a/plans/smoke.fmf
+++ b/plans/smoke.fmf
@@ -1,4 +1,4 @@
-summary: Run smoke tests
+summary: Basic smoke test
 discover:
   how: fmf
 execute:

From 8cc26124622b468c40f34c7ff32ff99b3429a7e2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 20 Jul 2024 10:17:07 +0000
Subject: [PATCH 05/33] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 xmvn-generator.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index b404d6a..721540b 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -3,7 +3,7 @@
 
 Name:           xmvn-generator
 Version:        1.2.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        RPM dependency generator for Java
 License:        Apache-2.0
 URL:            https://github.com/fedora-java/xmvn-generator
@@ -65,6 +65,9 @@ install -D -p -m 644 src/main/rpm/xmvngen.attr %{buildroot}%{_fileattrsdir}/xmvn
 %doc README.md
 
 %changelog
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Fri May 31 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.2-4
 - Switch to a newer patch macro syntax
 

From 6ab4089984ed0a9cb2c0db3a4327c3bd9aa26b05 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 31 Jul 2024 20:53:30 +0200
Subject: [PATCH 06/33] 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 fd6100822a92d9a65d4da34ed720c064400ca372 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 20 Aug 2024 16:33:57 +0200
Subject: [PATCH 07/33] Switch from %setup to %autosetup

---
 xmvn-generator.spec | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index 721540b..a524832 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -39,10 +39,8 @@ from Lua.
 %{?javadoc_package}
 
 %prep
-%setup -q
-%patch 0 -p1
+%autosetup -p1 -C
 %if !0%{?fedora}
-%patch 1 -p1
 %endif
 %mvn_file : %{name}
 

From 963ad0525495424169035b6b3cc7c14c50fb5344 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 22 Aug 2024 22:13:19 +0200
Subject: [PATCH 08/33] Switch to non-numdered patches

---
 xmvn-generator.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index a524832..35944cf 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -11,8 +11,8 @@ ExclusiveArch:  %{java_arches}
 
 Source0:        https://github.com/fedora-java/xmvn-generator/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
-Patch0:         0001-Use-OpenJDK-21.patch
-Patch1:         0002-Enable-JPMS-provides-and-JAR-transformer.patch
+Patch:          0001-Use-OpenJDK-21.patch
+Patch:          0002-Enable-JPMS-provides-and-JAR-transformer.patch
 
 BuildRequires:  gcc
 BuildRequires:  rpm-devel

From 729142b7c173a891ca925603788863ab4cc47fd6 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 23 Aug 2024 00:45:21 +0200
Subject: [PATCH 09/33] Convert to %autorelease and %autochangelog

---
 changelog           | 35 +++++++++++++++++++++++++++++++++++
 xmvn-generator.spec | 38 ++------------------------------------
 2 files changed, 37 insertions(+), 36 deletions(-)
 create mode 100644 changelog

diff --git a/changelog b/changelog
new file mode 100644
index 0000000..73e5466
--- /dev/null
+++ b/changelog
@@ -0,0 +1,35 @@
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri May 31 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.2-4
+- Switch to a newer patch macro syntax
+
+* Thu Feb 22 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.2-3
+- Switch to Java 21 for runtime
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Dec 11 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.2-1
+- Update to upstream version 1.2.2
+
+* Wed Aug 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.1-4
+- Enable JPMS provides and JAR transformation in ELN
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Mar 17 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.1-2
+- Enable javadoc package
+
+* Mon Mar 13 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.1-1
+- Update to upstream version 1.2.1
+
+* Fri Mar 10 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.0-1
+- Update to upstream version 1.2.0
+
+* Mon Mar 06 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.0-1
+- Update to upstream version 1.1.0
+
+* Mon Mar 06 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0.0-1
+- Initial packaging
diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index 35944cf..24d3535 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -3,7 +3,7 @@
 
 Name:           xmvn-generator
 Version:        1.2.2
-Release:        5%{?dist}
+Release:        %autorelease
 Summary:        RPM dependency generator for Java
 License:        Apache-2.0
 URL:            https://github.com/fedora-java/xmvn-generator
@@ -63,38 +63,4 @@ install -D -p -m 644 src/main/rpm/xmvngen.attr %{buildroot}%{_fileattrsdir}/xmvn
 %doc README.md
 
 %changelog
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Fri May 31 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.2-4
-- Switch to a newer patch macro syntax
-
-* Thu Feb 22 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.2-3
-- Switch to Java 21 for runtime
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Dec 11 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.2-1
-- Update to upstream version 1.2.2
-
-* Wed Aug 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.1-4
-- Enable JPMS provides and JAR transformation in ELN
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Mar 17 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.1-2
-- Enable javadoc package
-
-* Mon Mar 13 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.1-1
-- Update to upstream version 1.2.1
-
-* Fri Mar 10 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.0-1
-- Update to upstream version 1.2.0
-
-* Mon Mar 06 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.0-1
-- Update to upstream version 1.1.0
-
-* Mon Mar 06 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0.0-1
-- Initial packaging
+%autochangelog

From f842ac2c33753ff8f0c01089c42c3a96de2fc696 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sun, 25 Aug 2024 10:31:36 +0200
Subject: [PATCH 10/33] Update to upstream version 1.2.3

- Resolves: rhbz#2307788
---
 .gitignore                                    |  1 +
 ...le-JPMS-provides-and-JAR-transformer.patch |  6 ++---
 0001-Use-OpenJDK-21.patch                     | 25 -------------------
 sources                                       |  2 +-
 xmvn-generator.spec                           |  6 ++---
 5 files changed, 8 insertions(+), 32 deletions(-)
 rename 0002-Enable-JPMS-provides-and-JAR-transformer.patch => 0001-Enable-JPMS-provides-and-JAR-transformer.patch (91%)
 delete mode 100644 0001-Use-OpenJDK-21.patch

diff --git a/.gitignore b/.gitignore
index e7f5183..a023783 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /xmvn-generator-1.2.0.tar.gz
 /xmvn-generator-1.2.1.tar.gz
 /xmvn-generator-1.2.2.tar.gz
+/xmvn-generator-1.2.3.tar.gz
diff --git a/0002-Enable-JPMS-provides-and-JAR-transformer.patch b/0001-Enable-JPMS-provides-and-JAR-transformer.patch
similarity index 91%
rename from 0002-Enable-JPMS-provides-and-JAR-transformer.patch
rename to 0001-Enable-JPMS-provides-and-JAR-transformer.patch
index 48ddd04..9c5c7ff 100644
--- a/0002-Enable-JPMS-provides-and-JAR-transformer.patch
+++ b/0001-Enable-JPMS-provides-and-JAR-transformer.patch
@@ -1,7 +1,7 @@
-From 1f80a6d816dc3dde83dc3df0d94d97b8a7f62937 Mon Sep 17 00:00:00 2001
+From e8c5b8c8bc2523b73a70fec525dec928ae8d8ec3 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Wed, 30 Aug 2023 15:53:26 +0200
-Subject: [PATCH 2/2] Enable JPMS provides and JAR transformer
+Subject: [PATCH] Enable JPMS provides and JAR transformer
 
 ---
  src/main/rpm/macros.xmvngen | 6 +++---
@@ -35,5 +35,5 @@ index 0b124f4..b1ef101 100644
 -%__xmvngen_post_install_hooks %{nil}
 +%__xmvngen_post_install_hooks org.fedoraproject.xmvn.generator.transformer.TransformerHookFactory
 -- 
-2.41.0
+2.46.0
 
diff --git a/0001-Use-OpenJDK-21.patch b/0001-Use-OpenJDK-21.patch
deleted file mode 100644
index a33b9b8..0000000
--- a/0001-Use-OpenJDK-21.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 089eacff83657ad118c1348ef521e46dc18645df Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Thu, 22 Feb 2024 05:30:33 +0100
-Subject: [PATCH 1/2] Use OpenJDK 21
-
----
- src/main/rpm/macros.xmvngen | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main/rpm/macros.xmvngen b/src/main/rpm/macros.xmvngen
-index 4ff3f22..0b124f4 100644
---- a/src/main/rpm/macros.xmvngen
-+++ b/src/main/rpm/macros.xmvngen
-@@ -3,7 +3,7 @@
- %__xmvngen_debug %{nil}
- 
- # Path to JVM library (libjvm.so).  Java 17 or newer is required.
--%__xmvngen_libjvm %{_jvmdir}/jre-17-openjdk/lib/server/libjvm.so
-+%__xmvngen_libjvm %{_jvmdir}/jre-21-openjdk/lib/server/libjvm.so
- 
- # Class path of nested JVM.  This should be a colon-separated list of
- # JARs that contains xmvn-generator.jar, JARs with third-party
--- 
-2.41.0
-
diff --git a/sources b/sources
index e44fb62..d939b59 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xmvn-generator-1.2.2.tar.gz) = 7d4a71ed8847456d70df6357864ffd877bf36ffb843138f3ba0e932ee24957dcefe35c0f1bf2f2b7693ec927a58d0dc55e66edbcd15f6741d1149bf1799d4de1
+SHA512 (xmvn-generator-1.2.3.tar.gz) = 2ffb24a5824b07cf6c554c5110a79e726b0643bdd7b9f157ff151dadbcf05910937906396b7e8b100cccd25b30631fdcf90febb1f2b0576f93be132f43fccbd1
diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index 24d3535..7940211 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -2,7 +2,7 @@
 %bcond_with bootstrap
 
 Name:           xmvn-generator
-Version:        1.2.2
+Version:        1.2.3
 Release:        %autorelease
 Summary:        RPM dependency generator for Java
 License:        Apache-2.0
@@ -11,11 +11,11 @@ ExclusiveArch:  %{java_arches}
 
 Source0:        https://github.com/fedora-java/xmvn-generator/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
-Patch:          0001-Use-OpenJDK-21.patch
-Patch:          0002-Enable-JPMS-provides-and-JAR-transformer.patch
+Patch:          0001-Enable-JPMS-provides-and-JAR-transformer.patch
 
 BuildRequires:  gcc
 BuildRequires:  rpm-devel
+BuildRequires:  lujavrite
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else

From 313ebc98795ea245fa3befdfe4e87b8ff867fcf8 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 27 Aug 2024 17:19:28 +0200
Subject: [PATCH 11/33] Remove unused empty conditional

---
 xmvn-generator.spec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index 7940211..f667034 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -40,8 +40,6 @@ from Lua.
 
 %prep
 %autosetup -p1 -C
-%if !0%{?fedora}
-%endif
 %mvn_file : %{name}
 
 %build

From 2e49a7fa4d99681094e9bdce31a12c49c2923e74 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 5 Sep 2024 12:41:30 +0200
Subject: [PATCH 12/33] Add commons-io to classpath

---
 ...le-JPMS-provides-and-JAR-transformer.patch |  2 +-
 0002-Add-commons-io-to-classpath.patch        | 25 +++++++++++++++++++
 xmvn-generator.spec                           |  1 +
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 0002-Add-commons-io-to-classpath.patch

diff --git a/0001-Enable-JPMS-provides-and-JAR-transformer.patch b/0001-Enable-JPMS-provides-and-JAR-transformer.patch
index 9c5c7ff..74da03e 100644
--- a/0001-Enable-JPMS-provides-and-JAR-transformer.patch
+++ b/0001-Enable-JPMS-provides-and-JAR-transformer.patch
@@ -1,7 +1,7 @@
 From e8c5b8c8bc2523b73a70fec525dec928ae8d8ec3 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Wed, 30 Aug 2023 15:53:26 +0200
-Subject: [PATCH] Enable JPMS provides and JAR transformer
+Subject: [PATCH 1/2] Enable JPMS provides and JAR transformer
 
 ---
  src/main/rpm/macros.xmvngen | 6 +++---
diff --git a/0002-Add-commons-io-to-classpath.patch b/0002-Add-commons-io-to-classpath.patch
new file mode 100644
index 0000000..2014059
--- /dev/null
+++ b/0002-Add-commons-io-to-classpath.patch
@@ -0,0 +1,25 @@
+From f0e64ae6c5ce9208a315dceed012461581dbfcf0 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Thu, 5 Sep 2024 12:38:21 +0200
+Subject: [PATCH 2/2] Add commons-io to classpath
+
+---
+ src/main/rpm/macros.xmvngen | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main/rpm/macros.xmvngen b/src/main/rpm/macros.xmvngen
+index b1ef101..21f9327 100644
+--- a/src/main/rpm/macros.xmvngen
++++ b/src/main/rpm/macros.xmvngen
+@@ -8,7 +8,7 @@
+ # Class path of nested JVM.  This should be a colon-separated list of
+ # JARs that contains xmvn-generator.jar, JARs with third-party
+ # generators or hooks (if any), and all other dependencies.
+-%__xmvngen_classpath %{_jnidir}/xmvn-generator.jar:%{_javadir}/objectweb-asm/asm.jar:%{_javadir}/commons-compress.jar
++%__xmvngen_classpath %{_jnidir}/xmvn-generator.jar:%{_javadir}/objectweb-asm/asm.jar:%{_javadir}/commons-compress.jar:%{_javadir}/commons-io.jar
+ 
+ # Specify which dependency generators should be ran.
+ # Values should be a space-separated list of qualified class names of
+-- 
+2.46.0
+
diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index f667034..8375789 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -12,6 +12,7 @@ ExclusiveArch:  %{java_arches}
 Source0:        https://github.com/fedora-java/xmvn-generator/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 Patch:          0001-Enable-JPMS-provides-and-JAR-transformer.patch
+Patch:          0002-Add-commons-io-to-classpath.patch
 
 BuildRequires:  gcc
 BuildRequires:  rpm-devel

From 89aaad00d8976e02e10aeb22ec0a8a15fbe727e3 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 27 Sep 2024 16:02:17 +0200
Subject: [PATCH 13/33] Update to upstream version 2.0.0

- Resolves: rhbz#2315222
---
 .gitignore                                    |  1 +
 ...le-JPMS-provides-and-JAR-transformer.patch | 39 -------------------
 0002-Add-commons-io-to-classpath.patch        | 25 ------------
 sources                                       |  2 +-
 xmvn-generator.spec                           |  5 +--
 5 files changed, 3 insertions(+), 69 deletions(-)
 delete mode 100644 0001-Enable-JPMS-provides-and-JAR-transformer.patch
 delete mode 100644 0002-Add-commons-io-to-classpath.patch

diff --git a/.gitignore b/.gitignore
index a023783..da15d77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /xmvn-generator-1.2.1.tar.gz
 /xmvn-generator-1.2.2.tar.gz
 /xmvn-generator-1.2.3.tar.gz
+/xmvn-generator-2.0.0.tar.gz
diff --git a/0001-Enable-JPMS-provides-and-JAR-transformer.patch b/0001-Enable-JPMS-provides-and-JAR-transformer.patch
deleted file mode 100644
index 74da03e..0000000
--- a/0001-Enable-JPMS-provides-and-JAR-transformer.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e8c5b8c8bc2523b73a70fec525dec928ae8d8ec3 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Wed, 30 Aug 2023 15:53:26 +0200
-Subject: [PATCH 1/2] Enable JPMS provides and JAR transformer
-
----
- src/main/rpm/macros.xmvngen | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/main/rpm/macros.xmvngen b/src/main/rpm/macros.xmvngen
-index 0b124f4..b1ef101 100644
---- a/src/main/rpm/macros.xmvngen
-+++ b/src/main/rpm/macros.xmvngen
-@@ -1,6 +1,6 @@
- # Debug enable flag.
- # Setting this to non-empty value enables debugging output.
--%__xmvngen_debug %{nil}
-+%__xmvngen_debug 1
- 
- # Path to JVM library (libjvm.so).  Java 17 or newer is required.
- %__xmvngen_libjvm %{_jvmdir}/jre-21-openjdk/lib/server/libjvm.so
-@@ -15,7 +15,7 @@
- # generator factories (classes implementing GeneratorFactory interface).
- # Available hook factories are:
- #  * org.fedoraproject.xmvn.generator.jpms.JPMSGeneratorFactory
--%__xmvngen_provides_generators %{nil}
-+%__xmvngen_provides_generators org.fedoraproject.xmvn.generator.jpms.JPMSGeneratorFactory
- %__xmvngen_requires_generators %{nil}
- 
- # Specify which post-install hooks should be ran.
-@@ -23,4 +23,4 @@
- # hook factories (classes implementing HookFactory interface).
- # Available hook factories are:
- #  * org.fedoraproject.xmvn.generator.transformer.TransformerHookFactory
--%__xmvngen_post_install_hooks %{nil}
-+%__xmvngen_post_install_hooks org.fedoraproject.xmvn.generator.transformer.TransformerHookFactory
--- 
-2.46.0
-
diff --git a/0002-Add-commons-io-to-classpath.patch b/0002-Add-commons-io-to-classpath.patch
deleted file mode 100644
index 2014059..0000000
--- a/0002-Add-commons-io-to-classpath.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f0e64ae6c5ce9208a315dceed012461581dbfcf0 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Thu, 5 Sep 2024 12:38:21 +0200
-Subject: [PATCH 2/2] Add commons-io to classpath
-
----
- src/main/rpm/macros.xmvngen | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main/rpm/macros.xmvngen b/src/main/rpm/macros.xmvngen
-index b1ef101..21f9327 100644
---- a/src/main/rpm/macros.xmvngen
-+++ b/src/main/rpm/macros.xmvngen
-@@ -8,7 +8,7 @@
- # Class path of nested JVM.  This should be a colon-separated list of
- # JARs that contains xmvn-generator.jar, JARs with third-party
- # generators or hooks (if any), and all other dependencies.
--%__xmvngen_classpath %{_jnidir}/xmvn-generator.jar:%{_javadir}/objectweb-asm/asm.jar:%{_javadir}/commons-compress.jar
-+%__xmvngen_classpath %{_jnidir}/xmvn-generator.jar:%{_javadir}/objectweb-asm/asm.jar:%{_javadir}/commons-compress.jar:%{_javadir}/commons-io.jar
- 
- # Specify which dependency generators should be ran.
- # Values should be a space-separated list of qualified class names of
--- 
-2.46.0
-
diff --git a/sources b/sources
index d939b59..e13f407 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xmvn-generator-1.2.3.tar.gz) = 2ffb24a5824b07cf6c554c5110a79e726b0643bdd7b9f157ff151dadbcf05910937906396b7e8b100cccd25b30631fdcf90febb1f2b0576f93be132f43fccbd1
+SHA512 (xmvn-generator-2.0.0.tar.gz) = 73328e10e32dd85a8ae1bedcd277f4c5a429ffcbb29b83489006ed4d53d0db9a4da42f63acd1574167f5f34fb9f8be4ca8dfc299c8ca0009b29ac37743a7759a
diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index 8375789..22adb13 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -2,7 +2,7 @@
 %bcond_with bootstrap
 
 Name:           xmvn-generator
-Version:        1.2.3
+Version:        2.0.0
 Release:        %autorelease
 Summary:        RPM dependency generator for Java
 License:        Apache-2.0
@@ -11,9 +11,6 @@ ExclusiveArch:  %{java_arches}
 
 Source0:        https://github.com/fedora-java/xmvn-generator/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
-Patch:          0001-Enable-JPMS-provides-and-JAR-transformer.patch
-Patch:          0002-Add-commons-io-to-classpath.patch
-
 BuildRequires:  gcc
 BuildRequires:  rpm-devel
 BuildRequires:  lujavrite

From c81ac04925c8488027b774945a96d25132609237 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 27 Sep 2024 18:28:53 +0200
Subject: [PATCH 14/33] Don't assert presence of required test packages

---
 tests/smoke/runtest.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh
index 2805b54..ac74c31 100755
--- a/tests/smoke/runtest.sh
+++ b/tests/smoke/runtest.sh
@@ -6,9 +6,6 @@ rlJournalStart
 
   rlPhaseStartSetup
     rlAssertRpm xmvn-generator
-    rlAssertRpm javapackages-local
-    rlAssertRpm rpm-build
-    rlAssertRpm java-21-openjdk-devel
   rlPhaseEnd
 
   rlPhaseStartTest

From 9ae37848edf7c5b2efd0637f5f688c17fc095511 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 7 Oct 2024 11:04:20 +0200
Subject: [PATCH 15/33] Update to upstream version 2.0.1

- Resolves: rhbz#2316917
- Resolves: rhbz#2316708
---
 .gitignore          | 1 +
 sources             | 2 +-
 xmvn-generator.spec | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index da15d77..1c60e5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /xmvn-generator-1.2.2.tar.gz
 /xmvn-generator-1.2.3.tar.gz
 /xmvn-generator-2.0.0.tar.gz
+/xmvn-generator-2.0.1.tar.gz
diff --git a/sources b/sources
index e13f407..d58bac9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xmvn-generator-2.0.0.tar.gz) = 73328e10e32dd85a8ae1bedcd277f4c5a429ffcbb29b83489006ed4d53d0db9a4da42f63acd1574167f5f34fb9f8be4ca8dfc299c8ca0009b29ac37743a7759a
+SHA512 (xmvn-generator-2.0.1.tar.gz) = ae3ea65ba0734e86cb56926ba395a0392120dfb9b79b0bb95320311c1697b4033fa2f25113556db2520392213e8b8a47bbdfb8431e77e0abe85229dc5c22d217
diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index 22adb13..d53e1da 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -2,7 +2,7 @@
 %bcond_with bootstrap
 
 Name:           xmvn-generator
-Version:        2.0.0
+Version:        2.0.1
 Release:        %autorelease
 Summary:        RPM dependency generator for Java
 License:        Apache-2.0
@@ -41,7 +41,7 @@ from Lua.
 %mvn_file : %{name}
 
 %build
-%mvn_build
+%mvn_build -- -P\!quality
 
 %install
 %mvn_install

From 30cb6c705a6186b8e749a6608e36e4fe480af7dc Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 29 Nov 2024 07:05:26 +0100
Subject: [PATCH 16/33] Update to upstream version 2.0.2

---
 .gitignore          | 1 +
 sources             | 2 +-
 xmvn-generator.spec | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1c60e5b..20aa1c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /xmvn-generator-1.2.3.tar.gz
 /xmvn-generator-2.0.0.tar.gz
 /xmvn-generator-2.0.1.tar.gz
+/xmvn-generator-2.0.2.tar.gz
diff --git a/sources b/sources
index d58bac9..ade3c19 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xmvn-generator-2.0.1.tar.gz) = ae3ea65ba0734e86cb56926ba395a0392120dfb9b79b0bb95320311c1697b4033fa2f25113556db2520392213e8b8a47bbdfb8431e77e0abe85229dc5c22d217
+SHA512 (xmvn-generator-2.0.2.tar.gz) = e8c1236d55d17c0af7697b9c4ec1ba93606a18ac2ad03df18f9e4b939c4c775c0f9b65fc03dbf91c40887a4747a592fc6aea6696c52ce0f54c15c823d63b6782
diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index d53e1da..392bbdc 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -2,7 +2,7 @@
 %bcond_with bootstrap
 
 Name:           xmvn-generator
-Version:        2.0.1
+Version:        2.0.2
 Release:        %autorelease
 Summary:        RPM dependency generator for Java
 License:        Apache-2.0

From 2ff85c80a501cbe658f11526c3f8385257c36380 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 29 Nov 2024 08:28:39 +0100
Subject: [PATCH 17/33] 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 9c0a6c2467a7cdc49bdd8fe71dbd6f3d9394508d Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 30 Dec 2024 16:01:19 +0100
Subject: [PATCH 18/33] Unify spec style with the rest of Java/Maven packages
 [skip changelog]

---
 xmvn-generator.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index 392bbdc..dd3a4ca 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -24,7 +24,6 @@ BuildRequires:  mvn(org.easymock:easymock)
 BuildRequires:  mvn(org.junit.jupiter:junit-jupiter)
 BuildRequires:  mvn(org.ow2.asm:asm)
 %endif
-
 Requires:       rpm-build
 Requires:       lujavrite
 Requires:       java-21-openjdk-headless

From 1260687595056e1e8f51bfa46c77759a63362642 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 30 Dec 2024 17:01:09 +0100
Subject: [PATCH 19/33] Sort dependencies [skip changelog]

---
 xmvn-generator.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index dd3a4ca..c888f52 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -12,8 +12,8 @@ ExclusiveArch:  %{java_arches}
 Source0:        https://github.com/fedora-java/xmvn-generator/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 BuildRequires:  gcc
-BuildRequires:  rpm-devel
 BuildRequires:  lujavrite
+BuildRequires:  rpm-devel
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
@@ -24,9 +24,9 @@ BuildRequires:  mvn(org.easymock:easymock)
 BuildRequires:  mvn(org.junit.jupiter:junit-jupiter)
 BuildRequires:  mvn(org.ow2.asm:asm)
 %endif
-Requires:       rpm-build
-Requires:       lujavrite
 Requires:       java-21-openjdk-headless
+Requires:       lujavrite
+Requires:       rpm-build
 
 %description
 XMvn Generator is a dependency generator for RPM Package Manager

From ee68217f4d09948fdc1c4bd1966c80acdeaa2057 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 30 Dec 2024 18:06:35 +0100
Subject: [PATCH 20/33] Explicitly declare javadoc subpackage [skip changelog]

---
 xmvn-generator.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index c888f52..27abff0 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -33,7 +33,11 @@ XMvn Generator is a dependency generator for RPM Package Manager
 written in Java and Lua, that uses LuJavRite library to call Java code
 from Lua.
 
-%{?javadoc_package}
+%package javadoc
+Summary:        API documentation for %{name}
+
+%description javadoc
+API documentation for %{name}.
 
 %prep
 %autosetup -p1 -C
@@ -57,5 +61,7 @@ install -D -p -m 644 src/main/rpm/xmvngen.attr %{buildroot}%{_fileattrsdir}/xmvn
 %license LICENSE NOTICE
 %doc README.md
 
+%files javadoc -f .mfiles-javadoc
+
 %changelog
 %autochangelog

From 84ce4416cc136882607a1a90f52b0be3e47b6499 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 19 Jan 2025 16:05:38 +0000
Subject: [PATCH 21/33] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild


From 801c01c57c66b8eaed636fea7ef167bce4ba789c Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sun, 16 Feb 2025 18:10:19 +0100
Subject: [PATCH 22/33] Declare javadoc package as noarch

---
 xmvn-generator.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index 27abff0..b352880 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -35,6 +35,7 @@ from Lua.
 
 %package javadoc
 Summary:        API documentation for %{name}
+BuildArch:      noarch
 
 %description javadoc
 API documentation for %{name}.

From 85ce062775f7e6d7ee4f9e3ffd8544864f9bf9d8 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 3 Mar 2025 11:57:14 +0100
Subject: [PATCH 23/33] Remove javadoc subpackage

---
 xmvn-generator.spec | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index b352880..45018ed 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -27,25 +27,20 @@ BuildRequires:  mvn(org.ow2.asm:asm)
 Requires:       java-21-openjdk-headless
 Requires:       lujavrite
 Requires:       rpm-build
+# TODO Remove in Fedora 46
+Obsoletes:      %{name}-javadoc < 2.0.2-9
 
 %description
 XMvn Generator is a dependency generator for RPM Package Manager
 written in Java and Lua, that uses LuJavRite library to call Java code
 from Lua.
 
-%package javadoc
-Summary:        API documentation for %{name}
-BuildArch:      noarch
-
-%description javadoc
-API documentation for %{name}.
-
 %prep
 %autosetup -p1 -C
 %mvn_file : %{name}
 
 %build
-%mvn_build -- -P\!quality
+%mvn_build -j -- -P\!quality
 
 %install
 %mvn_install
@@ -62,7 +57,5 @@ install -D -p -m 644 src/main/rpm/xmvngen.attr %{buildroot}%{_fileattrsdir}/xmvn
 %license LICENSE NOTICE
 %doc README.md
 
-%files javadoc -f .mfiles-javadoc
-
 %changelog
 %autochangelog

From 4abfa3b88494194762d63000915cfca5ce3f6a82 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 26 Mar 2025 08:43:19 +0100
Subject: [PATCH 24/33] 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 2463f2c0319e7007792dbdb1a2fcb9a4c5020382 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 22 May 2025 13:35:32 +0200
Subject: [PATCH 25/33] 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 1b3ed3c6dec7bcc7d9bae9105d6d351e0d3f5f03 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 30 Jun 2025 08:04:15 +0200
Subject: [PATCH 26/33] Disable verbose debug output by default

Resolves: rhbz#2375157
---
 ...able-verbose-debug-output-by-default.patch |  25 ++++
 ...al-stack-traces-unless-debugging-is-.patch | 111 ++++++++++++++++++
 xmvn-generator.spec                           |   5 +
 3 files changed, 141 insertions(+)
 create mode 100644 0001-Disable-verbose-debug-output-by-default.patch
 create mode 100644 0002-Suppress-non-fatal-stack-traces-unless-debugging-is-.patch

diff --git a/0001-Disable-verbose-debug-output-by-default.patch b/0001-Disable-verbose-debug-output-by-default.patch
new file mode 100644
index 0000000..f3a3cf1
--- /dev/null
+++ b/0001-Disable-verbose-debug-output-by-default.patch
@@ -0,0 +1,25 @@
+From 3333e26db4405a4606e2223f74c5b23d9b473c1a Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Mon, 30 Jun 2025 07:46:58 +0200
+Subject: [PATCH 1/2] Disable verbose debug output by default
+
+Resolves: rhbz#2375157
+---
+ src/main/rpm/macros.xmvngen | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main/rpm/macros.xmvngen b/src/main/rpm/macros.xmvngen
+index 5623fb2..b29156e 100644
+--- a/src/main/rpm/macros.xmvngen
++++ b/src/main/rpm/macros.xmvngen
+@@ -1,6 +1,6 @@
+ # Debug enable flag.
+ # Setting this to non-empty value enables debugging output.
+-%__xmvngen_debug 1
++%__xmvngen_debug %nil
+ 
+ # Path to JVM library (libjvm.so).  Java 21 or newer is required.
+ %__xmvngen_libjvm %{_jvmdir}/jre-21-openjdk/lib/server/libjvm.so
+-- 
+2.49.0
+
diff --git a/0002-Suppress-non-fatal-stack-traces-unless-debugging-is-.patch b/0002-Suppress-non-fatal-stack-traces-unless-debugging-is-.patch
new file mode 100644
index 0000000..379ca67
--- /dev/null
+++ b/0002-Suppress-non-fatal-stack-traces-unless-debugging-is-.patch
@@ -0,0 +1,111 @@
+From 35624a1e5972e4ddb8fefbcaa82ee6921ddd89b3 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Mon, 30 Jun 2025 08:13:20 +0200
+Subject: [PATCH 2/2] Suppress non-fatal stack traces unless debugging is
+ enabled
+
+Resolves: rhbz#2375157
+---
+ .../fedoraproject/xmvn/generator/jpms/JPMSGenerator.java    | 4 +++-
+ .../xmvn/generator/jpscript/JPackageScriptGenerator.java    | 3 ++-
+ .../org/fedoraproject/xmvn/generator/logging/Logger.java    | 6 ++++++
+ .../fedoraproject/xmvn/generator/maven/MavenGenerator.java  | 2 +-
+ .../xmvn/generator/transformer/TransformerHook.java         | 6 ++++--
+ 5 files changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/src/main/java/org/fedoraproject/xmvn/generator/jpms/JPMSGenerator.java b/src/main/java/org/fedoraproject/xmvn/generator/jpms/JPMSGenerator.java
+index 6e5ec53..5808273 100644
+--- a/src/main/java/org/fedoraproject/xmvn/generator/jpms/JPMSGenerator.java
++++ b/src/main/java/org/fedoraproject/xmvn/generator/jpms/JPMSGenerator.java
+@@ -29,6 +29,7 @@ import java.util.stream.Stream;
+ import org.fedoraproject.xmvn.generator.BuildContext;
+ import org.fedoraproject.xmvn.generator.Collector;
+ import org.fedoraproject.xmvn.generator.Generator;
++import org.fedoraproject.xmvn.generator.logging.Logger;
+ 
+ class JPMSGenerator implements Generator {
+     private final BuildContext context;
+@@ -75,7 +76,8 @@ class JPMSGenerator implements Generator {
+                                 }
+                             }
+                         } catch (IOException e) {
+-                            e.printStackTrace();
++                            // Continue despite exception
++                            Logger.debug(e);
+                         }
+                     }
+                 } catch (IOException e) {
+diff --git a/src/main/java/org/fedoraproject/xmvn/generator/jpscript/JPackageScriptGenerator.java b/src/main/java/org/fedoraproject/xmvn/generator/jpscript/JPackageScriptGenerator.java
+index dbcb537..cf81e43 100644
+--- a/src/main/java/org/fedoraproject/xmvn/generator/jpscript/JPackageScriptGenerator.java
++++ b/src/main/java/org/fedoraproject/xmvn/generator/jpscript/JPackageScriptGenerator.java
+@@ -24,6 +24,7 @@ import java.util.stream.Stream;
+ import org.fedoraproject.xmvn.generator.BuildContext;
+ import org.fedoraproject.xmvn.generator.Collector;
+ import org.fedoraproject.xmvn.generator.Generator;
++import org.fedoraproject.xmvn.generator.logging.Logger;
+ 
+ class JPackageScriptGenerator implements Generator {
+     private final BuildContext context;
+@@ -51,7 +52,7 @@ class JPackageScriptGenerator implements Generator {
+                 }
+             } catch (MalformedInputException e) {
+                 // Continue despite exception
+-                e.printStackTrace();
++                Logger.debug(e);
+             } catch (IOException e) {
+                 throw new UncheckedIOException(e);
+             }
+diff --git a/src/main/java/org/fedoraproject/xmvn/generator/logging/Logger.java b/src/main/java/org/fedoraproject/xmvn/generator/logging/Logger.java
+index 3aee1aa..55d189c 100644
+--- a/src/main/java/org/fedoraproject/xmvn/generator/logging/Logger.java
++++ b/src/main/java/org/fedoraproject/xmvn/generator/logging/Logger.java
+@@ -71,4 +71,10 @@ public class Logger {
+                 BOX_BOTTOM_LEFT + repeat(BOX_BORDER_HORIZONTAL, BOX_WIDTH - 2) + BOX_BOTTOM_RIGHT);
+         flush();
+     }
++
++    public static void debug(Throwable t) {
++        if (debugEnabled) {
++            t.printStackTrace();
++        }
++    }
+ }
+diff --git a/src/main/java/org/fedoraproject/xmvn/generator/maven/MavenGenerator.java b/src/main/java/org/fedoraproject/xmvn/generator/maven/MavenGenerator.java
+index 69c5a46..ae63d1b 100644
+--- a/src/main/java/org/fedoraproject/xmvn/generator/maven/MavenGenerator.java
++++ b/src/main/java/org/fedoraproject/xmvn/generator/maven/MavenGenerator.java
+@@ -295,8 +295,8 @@ class MavenGenerator implements Generator {
+                     try (StringWriter sw = new StringWriter();
+                             PrintWriter pw = new PrintWriter(sw)) {
+                         sw.append("Unable to generate POM dependencies: ");
+-                        e.printStackTrace(pw);
+                         Logger.debug(sw.toString());
++                        Logger.debug(e);
+                     } catch (IOException e1) {
+                         throw new UncheckedIOException(e1);
+                     }
+diff --git a/src/main/java/org/fedoraproject/xmvn/generator/transformer/TransformerHook.java b/src/main/java/org/fedoraproject/xmvn/generator/transformer/TransformerHook.java
+index 5914be4..436c59c 100644
+--- a/src/main/java/org/fedoraproject/xmvn/generator/transformer/TransformerHook.java
++++ b/src/main/java/org/fedoraproject/xmvn/generator/transformer/TransformerHook.java
+@@ -64,12 +64,14 @@ class TransformerHook implements Hook {
+                     try {
+                         jarTransformer.transformJar(filePath);
+                     } catch (IOException e) {
+-                        e.printStackTrace();
++                        // Continue despite exception
++                        Logger.debug(e);
+                     }
+                 }
+             }
+         } catch (IOException e) {
+-            e.printStackTrace();
++            // Continue despite exception
++            Logger.debug(e);
+         }
+     }
+ 
+-- 
+2.49.0
+
diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index 45018ed..b6901c7 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -11,6 +11,11 @@ ExclusiveArch:  %{java_arches}
 
 Source0:        https://github.com/fedora-java/xmvn-generator/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
+# https://github.com/fedora-java/xmvn-generator/pull/8
+Patch:          0001-Disable-verbose-debug-output-by-default.patch
+# https://github.com/fedora-java/xmvn-generator/pull/9
+Patch:          0002-Suppress-non-fatal-stack-traces-unless-debugging-is-.patch
+
 BuildRequires:  gcc
 BuildRequires:  lujavrite
 BuildRequires:  rpm-devel

From 9a2e45ccf0e9ea05eb939648bd68443fe8dcd18e Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 8 Jul 2025 10:40:51 +0200
Subject: [PATCH 27/33] Update to upstream version 2.1.0

- Convert from archful to purely noarch package
---
 .gitignore          |  1 +
 sources             |  2 +-
 xmvn-generator.spec | 27 +++++++++------------------
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 20aa1c0..1acc7ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /xmvn-generator-2.0.0.tar.gz
 /xmvn-generator-2.0.1.tar.gz
 /xmvn-generator-2.0.2.tar.gz
+/xmvn-generator-2.1.0.tar.gz
diff --git a/sources b/sources
index ade3c19..fbe9e44 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xmvn-generator-2.0.2.tar.gz) = e8c1236d55d17c0af7697b9c4ec1ba93606a18ac2ad03df18f9e4b939c4c775c0f9b65fc03dbf91c40887a4747a592fc6aea6696c52ce0f54c15c823d63b6782
+SHA512 (xmvn-generator-2.1.0.tar.gz) = c2d93cce66a7b577d002a35890dd8b38f3b9bc493464eaf5d6f03e998226c1a5212bbe4f96a40802269ee873cdb8a17abb2a2438df2f503aeb4f6c702a73d8cc
diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index b6901c7..a3f1776 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -1,44 +1,33 @@
-%global debug_package %{nil}
 %bcond_with bootstrap
 
 Name:           xmvn-generator
-Version:        2.0.2
+Version:        2.1.0
 Release:        %autorelease
 Summary:        RPM dependency generator for Java
 License:        Apache-2.0
 URL:            https://github.com/fedora-java/xmvn-generator
-ExclusiveArch:  %{java_arches}
+BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
-Source0:        https://github.com/fedora-java/xmvn-generator/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source:         https://github.com/fedora-java/xmvn-generator/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
-# https://github.com/fedora-java/xmvn-generator/pull/8
-Patch:          0001-Disable-verbose-debug-output-by-default.patch
-# https://github.com/fedora-java/xmvn-generator/pull/9
-Patch:          0002-Suppress-non-fatal-stack-traces-unless-debugging-is-.patch
-
-BuildRequires:  gcc
-BuildRequires:  lujavrite
-BuildRequires:  rpm-devel
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
 BuildRequires:  maven-local
+BuildRequires:  mvn(io.kojan:dola-bsx-api)
 BuildRequires:  mvn(org.apache.commons:commons-compress)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
 BuildRequires:  mvn(org.easymock:easymock)
 BuildRequires:  mvn(org.junit.jupiter:junit-jupiter)
 BuildRequires:  mvn(org.ow2.asm:asm)
 %endif
-Requires:       java-21-openjdk-headless
-Requires:       lujavrite
-Requires:       rpm-build
+Requires:       dola-bsx
 # TODO Remove in Fedora 46
 Obsoletes:      %{name}-javadoc < 2.0.2-9
 
 %description
 XMvn Generator is a dependency generator for RPM Package Manager
-written in Java and Lua, that uses LuJavRite library to call Java code
-from Lua.
+written in Java and Lua.
 
 %prep
 %autosetup -p1 -C
@@ -53,12 +42,14 @@ install -D -p -m 644 src/main/lua/xmvn-generator.lua %{buildroot}%{_rpmluadir}/x
 install -D -p -m 644 src/main/rpm/macros.xmvngen %{buildroot}%{_rpmmacrodir}/macros.xmvngen
 install -D -p -m 644 src/main/rpm/macros.xmvngenhook %{buildroot}%{_sysconfdir}/rpm/macros.xmvngenhook
 install -D -p -m 644 src/main/rpm/xmvngen.attr %{buildroot}%{_fileattrsdir}/xmvngen.attr
+install -D -p -m 644 src/main/conf/xmvn-generator.conf %{buildroot}%{_javaconfdir}/dola/classworlds/90-xmvn-generator.conf
 
 %files -f .mfiles
 %{_rpmluadir}/*
 %{_rpmmacrodir}/*
 %{_fileattrsdir}/*
 %{_sysconfdir}/rpm/*
+%{_javaconfdir}/dola/classworlds/90-xmvn-generator.conf
 %license LICENSE NOTICE
 %doc README.md
 

From a28861a0ad71c7340d7e1e46e8f3516db237b5c4 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sat, 12 Jul 2025 06:48:58 +0200
Subject: [PATCH 28/33] Update to upstream version 2.1.1

- Build with OpenJDK 25
---
 .gitignore          | 1 +
 sources             | 2 +-
 xmvn-generator.spec | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1acc7ec..92dc046 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /xmvn-generator-2.0.1.tar.gz
 /xmvn-generator-2.0.2.tar.gz
 /xmvn-generator-2.1.0.tar.gz
+/xmvn-generator-2.1.1.tar.zst
diff --git a/sources b/sources
index fbe9e44..6a8a083 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xmvn-generator-2.1.0.tar.gz) = c2d93cce66a7b577d002a35890dd8b38f3b9bc493464eaf5d6f03e998226c1a5212bbe4f96a40802269ee873cdb8a17abb2a2438df2f503aeb4f6c702a73d8cc
+SHA512 (xmvn-generator-2.1.1.tar.zst) = b3d0950fddd25bd9bc998c6b62b4a4784d36a00e06f2c2764cfb8a04ecd7397e771c925b7b0b0cb116664aeeae250e8fb9049a14b564392ae7d861cc4b40e0bd
diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index a3f1776..c3973ef 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -1,7 +1,7 @@
 %bcond_with bootstrap
 
 Name:           xmvn-generator
-Version:        2.1.0
+Version:        2.1.1
 Release:        %autorelease
 Summary:        RPM dependency generator for Java
 License:        Apache-2.0
@@ -9,12 +9,12 @@ URL:            https://github.com/fedora-java/xmvn-generator
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
 
-Source:         https://github.com/fedora-java/xmvn-generator/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source:         https://github.com/fedora-java/xmvn-generator/releases/download/%{version}/xmvn-generator-%{version}.tar.zst
 
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  maven-local
+BuildRequires:  maven-local-openjdk25
 BuildRequires:  mvn(io.kojan:dola-bsx-api)
 BuildRequires:  mvn(org.apache.commons:commons-compress)
 BuildRequires:  mvn(org.easymock:easymock)

From 0e6dd6c3192ec89b6347fed3fc037750e5c8195d Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sat, 12 Jul 2025 08:20:46 +0200
Subject: [PATCH 29/33] Bootstrap build [skip changelog]

---
 xmvn-generator.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index c3973ef..8786336 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -1,4 +1,4 @@
-%bcond_with bootstrap
+%bcond bootstrap 1
 
 Name:           xmvn-generator
 Version:        2.1.1

From 42722099747c39813066ebbd7c2eac0733d0ff79 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sat, 12 Jul 2025 08:39:17 +0200
Subject: [PATCH 30/33] Non-bootstrap build [skip changelog]

---
 xmvn-generator.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index 8786336..7020f0d 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -1,4 +1,4 @@
-%bcond bootstrap 1
+%bcond bootstrap 0
 
 Name:           xmvn-generator
 Version:        2.1.1

From 60c97b059af2b4dcfc8520ff77f34442a0e64158 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 20:58:11 +0000
Subject: [PATCH 31/33] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From 54f85ef06090e626bc8e5ce9f0a61b8e8c5cfaf3 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Mon, 28 Jul 2025 19:27:07 +0200
Subject: [PATCH 32/33] 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.

From 125a3b187af6928ce2638d5fcc587209077e8acc Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sat, 11 Oct 2025 07:54:07 +0200
Subject: [PATCH 33/33] Add commons-lang3 to generator classpath

---
 ...commons-lang3-to-generator-classpath.patch | 24 +++++++++++++++++++
 xmvn-generator.spec                           |  3 +++
 2 files changed, 27 insertions(+)
 create mode 100644 0001-Add-commons-lang3-to-generator-classpath.patch

diff --git a/0001-Add-commons-lang3-to-generator-classpath.patch b/0001-Add-commons-lang3-to-generator-classpath.patch
new file mode 100644
index 0000000..ed0c1dc
--- /dev/null
+++ b/0001-Add-commons-lang3-to-generator-classpath.patch
@@ -0,0 +1,24 @@
+From 6cd6f63c9745a2872ec42a55c3b5d96c16a632cb Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Sat, 11 Oct 2025 07:51:25 +0200
+Subject: [PATCH] Add commons-lang3 to generator classpath
+
+---
+ src/main/conf/xmvn-generator.conf | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/main/conf/xmvn-generator.conf b/src/main/conf/xmvn-generator.conf
+index 4e72124..af77f8b 100644
+--- a/src/main/conf/xmvn-generator.conf
++++ b/src/main/conf/xmvn-generator.conf
+@@ -3,6 +3,7 @@ import io.kojan.dola.rpm from Realm:bsx-api
+ load /usr/share/java/objectweb-asm/asm.jar
+ load /usr/share/java/commons-compress.jar
+ load /usr/share/java/commons-io.jar
++load /usr/share/java/commons-lang3.jar
+ load /usr/share/java/xmvn/xmvn-api.jar
+ load /usr/share/java/xmvn/xmvn-core.jar
+ load /usr/share/java/maven/maven-model.jar
+-- 
+2.51.0
+
diff --git a/xmvn-generator.spec b/xmvn-generator.spec
index 7020f0d..c842dcb 100644
--- a/xmvn-generator.spec
+++ b/xmvn-generator.spec
@@ -11,6 +11,9 @@ ExclusiveArch:  %{java_arches} noarch
 
 Source:         https://github.com/fedora-java/xmvn-generator/releases/download/%{version}/xmvn-generator-%{version}.tar.zst
 
+# https://github.com/fedora-java/xmvn-generator/pull/37
+Patch:          0001-Add-commons-lang3-to-generator-classpath.patch
+
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else