Add commons-io to classpath

Related: RHEL-74141

0001-Use-OpenJDK-21.patch

@@ -1,7 +1,7 @@
-From 089eacff83657ad118c1348ef521e46dc18645df Mon Sep 17 00:00:00 2001
+From 8b10d5219429fdabc7ec7772b91005e466a5ca0c 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
+Subject: [PATCH 1/3] Use OpenJDK 21
 
 ---
  src/main/rpm/macros.xmvngen | 2 +-
@@ -21,5 +21,5 @@ index 4ff3f22..0b124f4 100644
  # 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
+2.48.1
 

0002-Enable-JPMS-provides-and-JAR-transformer.patch

@@ -1,7 +1,7 @@
-From 1f80a6d816dc3dde83dc3df0d94d97b8a7f62937 Mon Sep 17 00:00:00 2001
+From 4683da91af27dddc93ebd5cda3b0f5a46824fdcc 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 2/3] 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.48.1
 

0003-Add-commons-io-to-classpath.patch

@@ -0,0 +1,25 @@
+From 111733c1ad109a9d5c8c25b09c2656bedd99036a Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Thu, 5 Sep 2024 12:38:21 +0200
+Subject: [PATCH 3/3] 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.48.1
+

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

xmvn-generator.spec

@@ -3,7 +3,7 @@
 
 Name:           xmvn-generator
 Version:        1.2.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        RPM dependency generator for Java
 License:        Apache-2.0
 URL:            https://github.com/fedora-java/xmvn-generator
@@ -11,8 +11,9 @@ 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
+Patch:          0003-Add-commons-io-to-classpath.patch
 
 BuildRequires:  gcc
 BuildRequires:  rpm-devel
@@ -65,6 +66,9 @@ install -D -p -m 644 src/main/rpm/xmvngen.attr %{buildroot}%{_fileattrsdir}/xmvn
 %doc README.md
 
 %changelog
+* Fri Jan 17 2025 Mikolaj Izdebski <mizdebsk@redhat.com>
+- Add commons-io to classpath
+
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.2.2-5
 - Bump release for October 2024 mass rebuild:
   Resolves: RHEL-64018