From e7f5396da468bf520928727af56341466c23567e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jan 2022 21:25:44 +0000
Subject: [PATCH 01/18] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 apache-commons-modeler.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apache-commons-modeler.spec b/apache-commons-modeler.spec
index 3953b29..811b10a 100644
--- a/apache-commons-modeler.spec
+++ b/apache-commons-modeler.spec
@@ -3,7 +3,7 @@
 
 Name:             apache-%{short_name}
 Version:          2.0.1
-Release:          30%{?dist}
+Release:          31%{?dist}
 Summary:          Model MBeans utility classes
 License:          ASL 2.0
 URL:              http://commons.apache.org/%{base_name}/
@@ -66,6 +66,9 @@ cp -p %{SOURCE1} .
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-30
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From 6130099ae7ecbca5b87e50b0ae9ee7bca65fe0c1 Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Sat, 5 Feb 2022 19:29:31 +0100
Subject: [PATCH 02/18] Rebuilt for java-17-openjdk as system jdk

https://fedoraproject.org/wiki/Changes/Java17
---
 apache-commons-modeler.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apache-commons-modeler.spec b/apache-commons-modeler.spec
index 811b10a..2d6a3ac 100644
--- a/apache-commons-modeler.spec
+++ b/apache-commons-modeler.spec
@@ -3,7 +3,7 @@
 
 Name:             apache-%{short_name}
 Version:          2.0.1
-Release:          31%{?dist}
+Release:          32%{?dist}
 Summary:          Model MBeans utility classes
 License:          ASL 2.0
 URL:              http://commons.apache.org/%{base_name}/
@@ -66,6 +66,9 @@ cp -p %{SOURCE1} .
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.0.1-32
+- Rebuilt for java-17-openjdk as system jdk
+
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-31
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From a2a56cee3c27b67a72827f4949a3b730f3e32408 Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Fri, 8 Jul 2022 14:30:59 +0200
Subject: [PATCH 03/18] Rebuilt for Drop i686 JDKs

https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs
---
 apache-commons-modeler.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apache-commons-modeler.spec b/apache-commons-modeler.spec
index 2d6a3ac..649f095 100644
--- a/apache-commons-modeler.spec
+++ b/apache-commons-modeler.spec
@@ -3,11 +3,12 @@
 
 Name:             apache-%{short_name}
 Version:          2.0.1
-Release:          32%{?dist}
+Release:          33%{?dist}
 Summary:          Model MBeans utility classes
 License:          ASL 2.0
 URL:              http://commons.apache.org/%{base_name}/
 BuildArch:        noarch
+ExclusiveArch:  %{java_arches} noarch
 
 Source0:          http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 # POM file based on the one from an unreleased upstream snapstream
@@ -66,6 +67,9 @@ cp -p %{SOURCE1} .
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 2.0.1-33
+- Rebuilt for Drop i686 JDKs
+
 * Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.0.1-32
 - Rebuilt for java-17-openjdk as system jdk
 

From d382229633289869109356d39415385f8cda84b5 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 20 Jul 2022 21:00:37 +0000
Subject: [PATCH 04/18] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 apache-commons-modeler.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apache-commons-modeler.spec b/apache-commons-modeler.spec
index 649f095..a4d70c3 100644
--- a/apache-commons-modeler.spec
+++ b/apache-commons-modeler.spec
@@ -3,7 +3,7 @@
 
 Name:             apache-%{short_name}
 Version:          2.0.1
-Release:          33%{?dist}
+Release:          34%{?dist}
 Summary:          Model MBeans utility classes
 License:          ASL 2.0
 URL:              http://commons.apache.org/%{base_name}/
@@ -67,6 +67,9 @@ cp -p %{SOURCE1} .
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 2.0.1-33
 - Rebuilt for Drop i686 JDKs
 

From 898f9071a4637e2afee7bd7bf76347f3aee14b06 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 18 Jan 2023 21:55:14 +0000
Subject: [PATCH 05/18] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 apache-commons-modeler.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apache-commons-modeler.spec b/apache-commons-modeler.spec
index a4d70c3..7a603c1 100644
--- a/apache-commons-modeler.spec
+++ b/apache-commons-modeler.spec
@@ -3,7 +3,7 @@
 
 Name:             apache-%{short_name}
 Version:          2.0.1
-Release:          34%{?dist}
+Release:          35%{?dist}
 Summary:          Model MBeans utility classes
 License:          ASL 2.0
 URL:              http://commons.apache.org/%{base_name}/
@@ -67,6 +67,9 @@ cp -p %{SOURCE1} .
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-35
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-34
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 1b8402a752e875db9105e6e5bb906b3d03a42864 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jul 2023 13:29:53 +0000
Subject: [PATCH 06/18] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 apache-commons-modeler.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apache-commons-modeler.spec b/apache-commons-modeler.spec
index 7a603c1..e60b7a3 100644
--- a/apache-commons-modeler.spec
+++ b/apache-commons-modeler.spec
@@ -3,7 +3,7 @@
 
 Name:             apache-%{short_name}
 Version:          2.0.1
-Release:          35%{?dist}
+Release:          36%{?dist}
 Summary:          Model MBeans utility classes
 License:          ASL 2.0
 URL:              http://commons.apache.org/%{base_name}/
@@ -67,6 +67,9 @@ cp -p %{SOURCE1} .
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-36
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-35
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From ba724aa8f18a982962d7fa3572211608f50eea08 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jan 2024 13:15:18 +0000
Subject: [PATCH 07/18] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 apache-commons-modeler.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apache-commons-modeler.spec b/apache-commons-modeler.spec
index e60b7a3..66a962b 100644
--- a/apache-commons-modeler.spec
+++ b/apache-commons-modeler.spec
@@ -3,7 +3,7 @@
 
 Name:             apache-%{short_name}
 Version:          2.0.1
-Release:          36%{?dist}
+Release:          37%{?dist}
 Summary:          Model MBeans utility classes
 License:          ASL 2.0
 URL:              http://commons.apache.org/%{base_name}/
@@ -67,6 +67,9 @@ cp -p %{SOURCE1} .
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-37
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-36
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From bed22414ab0a655fa8c05708b4d1646ab2f2409c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 22 Jan 2024 23:14:42 +0000
Subject: [PATCH 08/18] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 apache-commons-modeler.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apache-commons-modeler.spec b/apache-commons-modeler.spec
index 66a962b..7d2fe9b 100644
--- a/apache-commons-modeler.spec
+++ b/apache-commons-modeler.spec
@@ -3,7 +3,7 @@
 
 Name:             apache-%{short_name}
 Version:          2.0.1
-Release:          37%{?dist}
+Release:          38%{?dist}
 Summary:          Model MBeans utility classes
 License:          ASL 2.0
 URL:              http://commons.apache.org/%{base_name}/
@@ -67,6 +67,9 @@ cp -p %{SOURCE1} .
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-38
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-37
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From e82cc0a1829d47ec6bce8c00ead4fa8e70759b44 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 1 Feb 2024 05:34:37 +0100
Subject: [PATCH 09/18] Port to apache-commons-logging 1.3.0

---
 apache-commons-modeler.spec | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/apache-commons-modeler.spec b/apache-commons-modeler.spec
index 7d2fe9b..ced2cd6 100644
--- a/apache-commons-modeler.spec
+++ b/apache-commons-modeler.spec
@@ -3,7 +3,7 @@
 
 Name:             apache-%{short_name}
 Version:          2.0.1
-Release:          38%{?dist}
+Release:          39%{?dist}
 Summary:          Model MBeans utility classes
 License:          ASL 2.0
 URL:              http://commons.apache.org/%{base_name}/
@@ -16,7 +16,6 @@ Source1:          pom.xml
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(commons-digester:commons-digester)
-BuildRequires:  mvn(commons-logging:commons-logging-api)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.ant:ant)
 BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
@@ -44,6 +43,12 @@ sed -i 's/\r//' NOTICE.txt
 # Copy pom file into place
 cp -p %{SOURCE1} .
 
+# Full commons-logging is a transitive dependency (through commons-digester)
+%pom_remove_dep :commons-logging-api
+
+# xml-apis is part of JDK
+%pom_remove_dep :xml-apis
+
 # Remove redundant dep on mx4j
 %pom_remove_dep mx4j:mx4j-jmx
 
@@ -55,7 +60,7 @@ cp -p %{SOURCE1} .
 %mvn_file : %{name} %{short_name}
 
 %build
-%mvn_build -- -Dproject.build.sourceEncoding=UTF-8 -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
+%mvn_build -- -Dcommons.packageId=modeler
 
 %install
 %mvn_install
@@ -67,6 +72,9 @@ cp -p %{SOURCE1} .
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Thu Feb 01 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.1-39
+- Port to apache-commons-logging 1.3.0
+
 * Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-38
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From a75c26dfb89e1965669b073e0e7d4796b7cba7b5 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Tue, 27 Feb 2024 14:47:04 +0100
Subject: [PATCH 10/18] Rebuilt for java-21-openjdk as system jdk

https://fedoraproject.org/wiki/Changes/Java21
---
 apache-commons-modeler.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apache-commons-modeler.spec b/apache-commons-modeler.spec
index ced2cd6..f492f02 100644
--- a/apache-commons-modeler.spec
+++ b/apache-commons-modeler.spec
@@ -3,7 +3,7 @@
 
 Name:             apache-%{short_name}
 Version:          2.0.1
-Release:          39%{?dist}
+Release:          40%{?dist}
 Summary:          Model MBeans utility classes
 License:          ASL 2.0
 URL:              http://commons.apache.org/%{base_name}/
@@ -72,6 +72,9 @@ cp -p %{SOURCE1} .
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 2.0.1-40
+- Rebuilt for java-21-openjdk as system jdk
+
 * Thu Feb 01 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.1-39
 - Port to apache-commons-logging 1.3.0
 

From 7f655507597fcb7913ca49e7b5b9e85c5ded88c4 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 17 Jul 2024 17:12:10 +0000
Subject: [PATCH 11/18] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 apache-commons-modeler.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apache-commons-modeler.spec b/apache-commons-modeler.spec
index f492f02..bc5b00f 100644
--- a/apache-commons-modeler.spec
+++ b/apache-commons-modeler.spec
@@ -3,7 +3,7 @@
 
 Name:             apache-%{short_name}
 Version:          2.0.1
-Release:          40%{?dist}
+Release:          41%{?dist}
 Summary:          Model MBeans utility classes
 License:          ASL 2.0
 URL:              http://commons.apache.org/%{base_name}/
@@ -72,6 +72,9 @@ cp -p %{SOURCE1} .
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-41
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 2.0.1-40
 - Rebuilt for java-21-openjdk as system jdk
 

From 2c3ccb6403a0c3b07ea65c28c11cbfbffb679c48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Wed, 24 Jul 2024 15:25:44 +0200
Subject: [PATCH 12/18] convert ASL 2.0 license to SPDX

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
---
 apache-commons-modeler.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/apache-commons-modeler.spec b/apache-commons-modeler.spec
index bc5b00f..6c2fba8 100644
--- a/apache-commons-modeler.spec
+++ b/apache-commons-modeler.spec
@@ -3,9 +3,10 @@
 
 Name:             apache-%{short_name}
 Version:          2.0.1
-Release:          41%{?dist}
+Release:          42%{?dist}
 Summary:          Model MBeans utility classes
-License:          ASL 2.0
+# Automatically converted from old format: ASL 2.0 - review is highly recommended.
+License:          Apache-2.0
 URL:              http://commons.apache.org/%{base_name}/
 BuildArch:        noarch
 ExclusiveArch:  %{java_arches} noarch
@@ -72,6 +73,9 @@ cp -p %{SOURCE1} .
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Wed Jul 24 2024 Miroslav Suchý <msuchy@redhat.com> - 2.0.1-42
+- convert license to SPDX
+
 * Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-41
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From c083665ccf5700c2bcaff54b2c32a057bbcc4d97 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jan 2025 11:17:02 +0000
Subject: [PATCH 13/18] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 apache-commons-modeler.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apache-commons-modeler.spec b/apache-commons-modeler.spec
index 6c2fba8..c771a1b 100644
--- a/apache-commons-modeler.spec
+++ b/apache-commons-modeler.spec
@@ -3,7 +3,7 @@
 
 Name:             apache-%{short_name}
 Version:          2.0.1
-Release:          42%{?dist}
+Release:          43%{?dist}
 Summary:          Model MBeans utility classes
 # Automatically converted from old format: ASL 2.0 - review is highly recommended.
 License:          Apache-2.0
@@ -73,6 +73,9 @@ cp -p %{SOURCE1} .
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-43
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Wed Jul 24 2024 Miroslav Suchý <msuchy@redhat.com> - 2.0.1-42
 - convert license to SPDX
 

From bc7feb4b0ef35bd0b313182205e2a1249899f346 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 17:06:22 +0000
Subject: [PATCH 14/18] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 apache-commons-modeler.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apache-commons-modeler.spec b/apache-commons-modeler.spec
index c771a1b..3d1d3ae 100644
--- a/apache-commons-modeler.spec
+++ b/apache-commons-modeler.spec
@@ -3,7 +3,7 @@
 
 Name:             apache-%{short_name}
 Version:          2.0.1
-Release:          43%{?dist}
+Release:          44%{?dist}
 Summary:          Model MBeans utility classes
 # Automatically converted from old format: ASL 2.0 - review is highly recommended.
 License:          Apache-2.0
@@ -73,6 +73,9 @@ cp -p %{SOURCE1} .
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-44
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-43
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From 088db4cba0bfecb93bbba2abb364b114950164c8 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Tue, 29 Jul 2025 19:07:44 +0200
Subject: [PATCH 15/18] 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.
---
 apache-commons-modeler.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apache-commons-modeler.spec b/apache-commons-modeler.spec
index 3d1d3ae..dea917d 100644
--- a/apache-commons-modeler.spec
+++ b/apache-commons-modeler.spec
@@ -3,7 +3,7 @@
 
 Name:             apache-%{short_name}
 Version:          2.0.1
-Release:          44%{?dist}
+Release:          45%{?dist}
 Summary:          Model MBeans utility classes
 # Automatically converted from old format: ASL 2.0 - review is highly recommended.
 License:          Apache-2.0
@@ -15,7 +15,7 @@ Source0:          http://www.apache.org/dist/commons/%{base_name}/source/%{short
 # POM file based on the one from an unreleased upstream snapstream
 Source1:          pom.xml
 
-BuildRequires:  maven-local
+BuildRequires:  maven-local-openjdk25
 BuildRequires:  mvn(commons-digester:commons-digester)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.ant:ant)
@@ -73,6 +73,9 @@ cp -p %{SOURCE1} .
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Tue Jul 29 2025 jiri vanek <jvanek@redhat.com> - 2.0.1-45
+- Rebuilt for java-25-openjdk as preffered jdk
+
 * Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-44
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 

From d40de57f97d0758792afb4f50f40f7e7b33f5e5f Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Wed, 30 Jul 2025 14:03:39 +0200
Subject: [PATCH 16/18] Rrevert to jdk21

during rebuild for https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
your package failed to build. Is preemptively reverted back to versioned jdk21
---
 apache-commons-modeler.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apache-commons-modeler.spec b/apache-commons-modeler.spec
index dea917d..ee58914 100644
--- a/apache-commons-modeler.spec
+++ b/apache-commons-modeler.spec
@@ -3,7 +3,7 @@
 
 Name:             apache-%{short_name}
 Version:          2.0.1
-Release:          45%{?dist}
+Release:          46%{?dist}
 Summary:          Model MBeans utility classes
 # Automatically converted from old format: ASL 2.0 - review is highly recommended.
 License:          Apache-2.0
@@ -15,7 +15,7 @@ Source0:          http://www.apache.org/dist/commons/%{base_name}/source/%{short
 # POM file based on the one from an unreleased upstream snapstream
 Source1:          pom.xml
 
-BuildRequires:  maven-local-openjdk25
+BuildRequires:  maven-local-openjdk21
 BuildRequires:  mvn(commons-digester:commons-digester)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.ant:ant)
@@ -73,6 +73,9 @@ cp -p %{SOURCE1} .
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Wed Jul 30 2025 jiri vanek <jvanek@redhat.com> - 2.0.1-46
+- Rrevert to jdk21
+
 * Tue Jul 29 2025 jiri vanek <jvanek@redhat.com> - 2.0.1-45
 - Rebuilt for java-25-openjdk as preffered jdk
 

From 4ef57d943f006d650fe372d1b33672c0755c7bb2 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Tue, 6 Jan 2026 12:46:38 +0100
Subject: [PATCH 17/18] Bumped to jdk25

---
 apache-commons-modeler.spec |  6 +++---
 pom.xml                     | 31 +++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/apache-commons-modeler.spec b/apache-commons-modeler.spec
index ee58914..1129125 100644
--- a/apache-commons-modeler.spec
+++ b/apache-commons-modeler.spec
@@ -3,7 +3,7 @@
 
 Name:             apache-%{short_name}
 Version:          2.0.1
-Release:          46%{?dist}
+Release:          48%{?dist}
 Summary:          Model MBeans utility classes
 # Automatically converted from old format: ASL 2.0 - review is highly recommended.
 License:          Apache-2.0
@@ -15,7 +15,7 @@ Source0:          http://www.apache.org/dist/commons/%{base_name}/source/%{short
 # POM file based on the one from an unreleased upstream snapstream
 Source1:          pom.xml
 
-BuildRequires:  maven-local-openjdk21
+BuildRequires:  maven-local-openjdk25
 BuildRequires:  mvn(commons-digester:commons-digester)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.ant:ant)
@@ -55,7 +55,7 @@ cp -p %{SOURCE1} .
 
 # Fix ant dependency
 %pom_remove_dep ant:ant
-%pom_add_dep org.apache.ant:ant:1.8
+%pom_add_dep org.apache.ant:ant:1.10
 
 %mvn_alias : org.apache.commons:%{short_name}
 %mvn_file : %{name} %{short_name}
diff --git a/pom.xml b/pom.xml
index 014a0cd..cb08d1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,6 +197,37 @@
           </ignorePathsToDelete>
         </configuration>
       </plugin>
+<!-- copied from parent to be modified-->
+          <plugin>
+            <groupId>org.moditect</groupId>
+            <artifactId>moditect-maven-plugin</artifactId>
+            <version>${commons.moditect-maven-plugin.version}</version>
+            <executions>
+              <execution>
+                <id>add-module-infos</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>add-module-info</goal>
+                </goals>
+                <configuration>
+                  <jvmVersion>${moditect.java.version}</jvmVersion>
+                  <jdepsExtraArgs>
+<!-- added config--><arg>--ignore-missing-deps</arg> <!-- added config-->
+                    <arg>--multi-release=${moditect.java.version}</arg>
+                  </jdepsExtraArgs>
+                  <outputDirectory>${project.build.directory}</outputDirectory>
+                  <overwriteExistingFiles>true</overwriteExistingFiles>
+                  <failOnWarning>false</failOnWarning>
+                  <module>
+                    <moduleInfo>
+                      <name>${commons.module.name}</name>
+                      <addServiceUses>${commons.moditect-maven-plugin.addServiceUses}</addServiceUses>
+                    </moduleInfo>
+                  </module>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
     </plugins>
   </build>
 

From 3f0a143e498941d7394283239840a58d611d6d59 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 16 Jan 2026 03:47:35 +0000
Subject: [PATCH 18/18] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

---
 apache-commons-modeler.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apache-commons-modeler.spec b/apache-commons-modeler.spec
index 1129125..d67cd83 100644
--- a/apache-commons-modeler.spec
+++ b/apache-commons-modeler.spec
@@ -3,7 +3,7 @@
 
 Name:             apache-%{short_name}
 Version:          2.0.1
-Release:          48%{?dist}
+Release:          49%{?dist}
 Summary:          Model MBeans utility classes
 # Automatically converted from old format: ASL 2.0 - review is highly recommended.
 License:          Apache-2.0
@@ -73,6 +73,9 @@ cp -p %{SOURCE1} .
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-49
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
 * Wed Jul 30 2025 jiri vanek <jvanek@redhat.com> - 2.0.1-46
 - Rrevert to jdk21