From 513b9a0ff2ec209ca7dfe8c254a26d69cfbe5d9e Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 31 Aug 2022 08:36:51 +0200
Subject: [PATCH 01/27] Onboard package into gating

---
 .fmf/version           | 1 +
 ci.fmf                 | 1 +
 gating.yaml            | 8 ++++++++
 plans/javapackages.fmf | 7 +++++++
 4 files changed, 17 insertions(+)
 create mode 100644 .fmf/version
 create mode 100644 ci.fmf
 create mode 100644 gating.yaml
 create mode 100644 plans/javapackages.fmf

diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/ci.fmf b/ci.fmf
new file mode 100644
index 0000000..c5aa0e0
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1 @@
+resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..0d484d7
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,8 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_contexts:
+  - bodhi_update_push_testing
+  - bodhi_update_push_stable
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional}
diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
new file mode 100644
index 0000000..8f6c9cb
--- /dev/null
+++ b/plans/javapackages.fmf
@@ -0,0 +1,7 @@
+summary: Run javapackages-specific tests
+discover:
+  how: fmf
+  url: https://src.fedoraproject.org/tests/javapackages
+  ref: f37
+execute:
+  how: tmt

From 28308e693c6bcce47c7a822375b8ae8a91e7d53b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 20 Jan 2023 18:51:50 +0000
Subject: [PATCH 02/27] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

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

diff --git a/qdox.spec b/qdox.spec
index 585d921..cc3d276 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -4,7 +4,7 @@
 
 Name:           qdox
 Version:        2.0.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Extract class/interface/method definitions from sources
 License:        ASL 2.0
 URL:            https://github.com/paul-hammant/qdox
@@ -89,6 +89,9 @@ jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1}
 %license LICENSE.txt
 
 %changelog
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 41579b6f5ab54f81f4952e51fa0f7a97af20e1ac Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 21 Jul 2023 15:51:00 +0000
Subject: [PATCH 03/27] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

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

diff --git a/qdox.spec b/qdox.spec
index cc3d276..7f98112 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -4,7 +4,7 @@
 
 Name:           qdox
 Version:        2.0.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Extract class/interface/method definitions from sources
 License:        ASL 2.0
 URL:            https://github.com/paul-hammant/qdox
@@ -89,6 +89,9 @@ jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1}
 %license LICENSE.txt
 
 %changelog
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From 0c8a7885634ed52062d27c4e1d07f096719c1183 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 17 Aug 2023 20:07:52 +0200
Subject: [PATCH 04/27] Update to upstream version 2.0.3

---
 .gitignore                     |  1 +
 0001-Port-to-JFlex-1.7.0.patch | 39 ----------------------------------
 qdox.spec                      | 12 +++++------
 sources                        |  2 +-
 4 files changed, 8 insertions(+), 46 deletions(-)
 delete mode 100644 0001-Port-to-JFlex-1.7.0.patch

diff --git a/.gitignore b/.gitignore
index 179af13..979e06a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /qdox-2.0-M9.tar.gz
 /qdox-2.0~M10.tar.gz
 /qdox-2.0.0.tar.gz
+/qdox-2.0.3.tar.gz
diff --git a/0001-Port-to-JFlex-1.7.0.patch b/0001-Port-to-JFlex-1.7.0.patch
deleted file mode 100644
index 441858b..0000000
--- a/0001-Port-to-JFlex-1.7.0.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 31f530b26bd4625ffe41aa16c48836455ef81c23 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Fri, 7 Jun 2019 10:39:34 +0200
-Subject: [PATCH] Port to JFlex 1.7.0
-
----
- src/grammar/lexer.flex                                          | 2 +-
- .../java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java  | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/grammar/lexer.flex b/src/grammar/lexer.flex
-index 9b567ff..cd9d5b6 100644
---- a/src/grammar/lexer.flex
-+++ b/src/grammar/lexer.flex
-@@ -168,7 +168,7 @@ import java.util.*;
-   	}
- 
-     public JFlexLexer( java.io.InputStream stream, java.io.Writer writer ) {
--       this( stream );
-+       this( new java.io.InputStreamReader( stream, java.nio.charset.Charset.forName( "UTF-8" ) ) );
-        this.writer = writer;
-   	}
- 
-diff --git a/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java b/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java
-index c947f9b..5b415c0 100644
---- a/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java
-+++ b/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java
-@@ -112,7 +112,7 @@ public class ClassLoaderLibrary
-             if ( sourceStream != null )
-             {
-                 Builder builder = getModelBuilder();
--                JavaLexer lexer = new JFlexLexer( sourceStream );
-+                JavaLexer lexer = new JFlexLexer( new java.io.InputStreamReader( sourceStream, java.nio.charset.Charset.forName( "UTF-8" ) ) );
-                 Parser parser = new Parser( lexer, builder );
-                 parser.setDebugLexer( debugLexer );
-                 parser.setDebugParser( debugParser );
--- 
-2.21.0
-
diff --git a/qdox.spec b/qdox.spec
index 7f98112..6d0f0bc 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -3,8 +3,8 @@
 %global upstream_version %(echo %{version} | tr '~' '-')
 
 Name:           qdox
-Version:        2.0.0
-Release:        12%{?dist}
+Version:        2.0.3
+Release:        1%{?dist}
 Summary:        Extract class/interface/method definitions from sources
 License:        ASL 2.0
 URL:            https://github.com/paul-hammant/qdox
@@ -17,8 +17,6 @@ Source1:        qdox-MANIFEST.MF
 # Remove bundled binaries which are possibly proprietary
 Source2:        generate-tarball.sh
 
-Patch0:         0001-Port-to-JFlex-1.7.0.patch
-
 BuildRequires:  byaccj
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
@@ -42,7 +40,6 @@ API docs for %{name}.
 
 %prep
 %setup -q -n %{name}-%{upstream_version}
-%patch0 -p1
 
 # remove unnecessary dependency on parent POM
 %pom_remove_parent
@@ -52,7 +49,7 @@ API docs for %{name}.
 %pom_remove_plugin :maven-assembly-plugin
 %pom_remove_plugin :maven-failsafe-plugin
 %pom_remove_plugin :maven-invoker-plugin
-%pom_remove_plugin :maven-jflex-plugin
+%pom_remove_plugin :jflex-maven-plugin
 %pom_remove_plugin :maven-enforcer-plugin
 %pom_remove_plugin :exec-maven-plugin
 
@@ -89,6 +86,9 @@ jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1}
 %license LICENSE.txt
 
 %changelog
+* Thu Aug 17 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.3-1
+- Update to upstream version 2.0.3
+
 * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index 36d0ac0..25ed0d4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qdox-2.0.0.tar.gz) = 2ea7bd97ca720856a3f61aa12d4ec681708b599fe87c8942ac19e41b59cb56d3583f0953dc280d6244334d19762b7fe0c5693ee7acbaff2a4b421a3c959139b6
+SHA512 (qdox-2.0.3.tar.gz) = 507365056da084a93531f178461c367f426e3997c3fe7e8010d0e50528c99c5b8045d2fba84653889fdb3e42bff30a8dfb3ca5f22a239fcf095ebaeb6343d64b

From 55dffd5ccf128a8d826d87b9b84d9ebebbc82ad1 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 1 Sep 2023 13:20:36 +0200
Subject: [PATCH 05/27] Convert License tag to SPDX format

Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2
---
 qdox.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/qdox.spec b/qdox.spec
index 6d0f0bc..076aefe 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -4,9 +4,9 @@
 
 Name:           qdox
 Version:        2.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Extract class/interface/method definitions from sources
-License:        ASL 2.0
+License:        Apache-2.0
 URL:            https://github.com/paul-hammant/qdox
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
@@ -86,6 +86,9 @@ jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1}
 %license LICENSE.txt
 
 %changelog
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.3-2
+- Convert License tag to SPDX format
+
 * Thu Aug 17 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.3-1
 - Update to upstream version 2.0.3
 

From 3b1b51d05b8980a3a5429d86450b1a9a6c3db0ad Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 26 Oct 2023 07:33:08 +0200
Subject: [PATCH 06/27] Update javapackages test plan to f40

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

diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index 8f6c9cb..a2cdaba 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: f37
+  ref: f40
 execute:
   how: tmt

From 0f3748dc96e41bf4cfb427a422a2ad0a21ac4b95 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 22 Jan 2024 09:29:20 +0000
Subject: [PATCH 07/27] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

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

diff --git a/qdox.spec b/qdox.spec
index 076aefe..79cc690 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -4,7 +4,7 @@
 
 Name:           qdox
 Version:        2.0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Extract class/interface/method definitions from sources
 License:        Apache-2.0
 URL:            https://github.com/paul-hammant/qdox
@@ -86,6 +86,9 @@ jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1}
 %license LICENSE.txt
 
 %changelog
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.3-2
 - Convert License tag to SPDX format
 

From dba1b48af240b18ffe372918caf4fbd50b77e870 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 26 Jan 2024 13:48:06 +0000
Subject: [PATCH 08/27] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

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

diff --git a/qdox.spec b/qdox.spec
index 79cc690..d70b81b 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -4,7 +4,7 @@
 
 Name:           qdox
 Version:        2.0.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Extract class/interface/method definitions from sources
 License:        Apache-2.0
 URL:            https://github.com/paul-hammant/qdox
@@ -86,6 +86,9 @@ jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1}
 %license LICENSE.txt
 
 %changelog
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 76c90d5acb3a20c2bfd4fa0b15237803a332cf84 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 2 Feb 2024 19:59:41 +0100
Subject: [PATCH 09/27] Update to upstream version 2.1.0

---
 .gitignore |  1 +
 qdox.spec  | 15 ++++++++-------
 sources    |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 979e06a..6e87856 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /qdox-2.0~M10.tar.gz
 /qdox-2.0.0.tar.gz
 /qdox-2.0.3.tar.gz
+/qdox-2.1.0.tar.gz
diff --git a/qdox.spec b/qdox.spec
index d70b81b..fda898e 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -1,10 +1,8 @@
 %bcond_with bootstrap
 
-%global upstream_version %(echo %{version} | tr '~' '-')
-
 Name:           qdox
-Version:        2.0.3
-Release:        4%{?dist}
+Version:        2.1.0
+Release:        1%{?dist}
 Summary:        Extract class/interface/method definitions from sources
 License:        Apache-2.0
 URL:            https://github.com/paul-hammant/qdox
@@ -39,7 +37,7 @@ Summary:        Javadoc for %{name}
 API docs for %{name}.
 
 %prep
-%setup -q -n %{name}-%{upstream_version}
+%setup -q
 
 # remove unnecessary dependency on parent POM
 %pom_remove_parent
@@ -70,10 +68,10 @@ jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexe
 )
 
 # Build artifact
-%mvn_build -f -- -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7
+%mvn_build -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
 
 # Inject OSGi manifests
-jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1}
+jar ufm target/%{name}-%{version}.jar %{SOURCE1}
 
 %install
 %mvn_install
@@ -86,6 +84,9 @@ jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1}
 %license LICENSE.txt
 
 %changelog
+* Fri Feb 02 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.0-1
+- Update to upstream version 2.1.0
+
 * Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index 25ed0d4..27b7ff8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qdox-2.0.3.tar.gz) = 507365056da084a93531f178461c367f426e3997c3fe7e8010d0e50528c99c5b8045d2fba84653889fdb3e42bff30a8dfb3ca5f22a239fcf095ebaeb6343d64b
+SHA512 (qdox-2.1.0.tar.gz) = d125daaee44426ebfc56e70d8fb8ae390d6831f50d74f73fb9d749c5be54e4dcd714a8ed9cdb32a9c92d70d5658066924820af042625c3ee753c616ae9ddb46c

From 40bf00184d1f49cc6c08ef5326f6d0185f97cbd3 Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Fri, 23 Feb 2024 14:40:34 +0100
Subject: [PATCH 10/27] 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
---
 qdox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/qdox.spec b/qdox.spec
index fda898e..768c562 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -2,7 +2,7 @@
 
 Name:           qdox
 Version:        2.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Extract class/interface/method definitions from sources
 License:        Apache-2.0
 URL:            https://github.com/paul-hammant/qdox
@@ -84,6 +84,9 @@ jar ufm target/%{name}-%{version}.jar %{SOURCE1}
 %license LICENSE.txt
 
 %changelog
+* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 2.1.0-2
+- bump of release for for java-21-openjdk as system jdk
+
 * Fri Feb 02 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.0-1
 - Update to upstream version 2.1.0
 

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

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

diff --git a/qdox.spec b/qdox.spec
index 768c562..1981e43 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -2,7 +2,7 @@
 
 Name:           qdox
 Version:        2.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Extract class/interface/method definitions from sources
 License:        Apache-2.0
 URL:            https://github.com/paul-hammant/qdox
@@ -84,6 +84,9 @@ jar ufm target/%{name}-%{version}.jar %{SOURCE1}
 %license LICENSE.txt
 
 %changelog
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 2.1.0-3
+- Rebuilt for java-21-openjdk as system jdk
+
 * Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 2.1.0-2
 - bump of release for for java-21-openjdk as system jdk
 

From 9ee0eb4cc08eb1906a48416264d042ebb3dc50be Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 4 Jul 2024 11:35:01 +0200
Subject: [PATCH 12/27] Enable upstream test suite

---
 qdox-port-tests-to-java-21.patch | 11 +++++++++++
 qdox.spec                        | 13 +++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 qdox-port-tests-to-java-21.patch

diff --git a/qdox-port-tests-to-java-21.patch b/qdox-port-tests-to-java-21.patch
new file mode 100644
index 0000000..96d67d1
--- /dev/null
+++ b/qdox-port-tests-to-java-21.patch
@@ -0,0 +1,11 @@
+--- qdox-2.1.0/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java~	2024-07-04 11:31:50.910952394 +0200
++++ qdox-2.1.0/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java	2024-07-04 11:31:53.318965066 +0200
+@@ -319,7 +319,7 @@
+         JavaClass list = builder.getClassByName("java.util.List");
+         Assertions.assertTrue(list.isInterface());
+         Assertions.assertNull(list.getSuperJavaClass());
+-        Assertions.assertEquals("java.util.Collection", list.getImplements().get(0).getValue());
++        Assertions.assertEquals("java.util.SequencedCollection", list.getImplements().get(0).getValue());
+     }
+ 
+     @Test
diff --git a/qdox.spec b/qdox.spec
index 1981e43..2a75190 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -2,7 +2,7 @@
 
 Name:           qdox
 Version:        2.1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Extract class/interface/method definitions from sources
 License:        Apache-2.0
 URL:            https://github.com/paul-hammant/qdox
@@ -15,12 +15,17 @@ Source1:        qdox-MANIFEST.MF
 # Remove bundled binaries which are possibly proprietary
 Source2:        generate-tarball.sh
 
+Patch0:         qdox-port-tests-to-java-21.patch
+
 BuildRequires:  byaccj
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
 BuildRequires:  maven-local
 BuildRequires:  jflex
+BuildRequires:  mvn(org.assertj:assertj-core)
+BuildRequires:  mvn(org.junit.jupiter:junit-jupiter)
+BuildRequires:  mvn(org.mockito:mockito-core)
 %endif
 
 %description
@@ -38,6 +43,7 @@ API docs for %{name}.
 
 %prep
 %setup -q
+%patch 0 -p1
 
 # remove unnecessary dependency on parent POM
 %pom_remove_parent
@@ -68,7 +74,7 @@ jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexe
 )
 
 # Build artifact
-%mvn_build -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
+%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
 
 # Inject OSGi manifests
 jar ufm target/%{name}-%{version}.jar %{SOURCE1}
@@ -84,6 +90,9 @@ jar ufm target/%{name}-%{version}.jar %{SOURCE1}
 %license LICENSE.txt
 
 %changelog
+* Thu Jul 04 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.0-4
+- Enable upstream test suite
+
 * Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 2.1.0-3
 - Rebuilt for java-21-openjdk as system jdk
 

From 8f046952e4ef443973e6f91f8387fdbd0d642be2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jul 2024 17:34:00 +0000
Subject: [PATCH 13/27] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

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

diff --git a/qdox.spec b/qdox.spec
index 2a75190..caf9387 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -2,7 +2,7 @@
 
 Name:           qdox
 Version:        2.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Extract class/interface/method definitions from sources
 License:        Apache-2.0
 URL:            https://github.com/paul-hammant/qdox
@@ -90,6 +90,9 @@ jar ufm target/%{name}-%{version}.jar %{SOURCE1}
 %license LICENSE.txt
 
 %changelog
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Thu Jul 04 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.0-4
 - Enable upstream test suite
 

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

---
 qdox.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/qdox.spec b/qdox.spec
index caf9387..a0abfff 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -42,8 +42,7 @@ Summary:        Javadoc for %{name}
 API docs for %{name}.
 
 %prep
-%setup -q
-%patch 0 -p1
+%autosetup -p1 -C
 
 # remove unnecessary dependency on parent POM
 %pom_remove_parent

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

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

diff --git a/qdox.spec b/qdox.spec
index a0abfff..2e7219a 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -15,7 +15,7 @@ Source1:        qdox-MANIFEST.MF
 # Remove bundled binaries which are possibly proprietary
 Source2:        generate-tarball.sh
 
-Patch0:         qdox-port-tests-to-java-21.patch
+Patch:          qdox-port-tests-to-java-21.patch
 
 BuildRequires:  byaccj
 %if %{with bootstrap}

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

---
 changelog | 270 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 qdox.spec | 273 +-----------------------------------------------------
 2 files changed, 272 insertions(+), 271 deletions(-)
 create mode 100644 changelog

diff --git a/changelog b/changelog
new file mode 100644
index 0000000..498a7c9
--- /dev/null
+++ b/changelog
@@ -0,0 +1,270 @@
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Thu Jul 04 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.0-4
+- Enable upstream test suite
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 2.1.0-3
+- Rebuilt for java-21-openjdk as system jdk
+
+* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 2.1.0-2
+- bump of release for for java-21-openjdk as system jdk
+
+* Fri Feb 02 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.0-1
+- Update to upstream version 2.1.0
+
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.3-2
+- Convert License tag to SPDX format
+
+* Thu Aug 17 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.3-1
+- Update to upstream version 2.0.3
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.0.0-9
+- Rebuilt for java-17-openjdk as system jdk
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.0-7
+- Set explicit Java compiler source/target levels to 1.7
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.0-5
+- Bootstrap build
+- Non-bootstrap build
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 0:2.0.0-2
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Wed Feb 26 2020 Marian Koncek <mkoncek@redhat.com> - 2.0.0-1
+- Update to upstream version 2.0.0
+
+* Thu Feb 13 2020 Fabio Valentini <decathorpe@gmail.com> - 0:2.0.0-1
+- Update to version 2.0.0.
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-8.M9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Nov 22 2019 Fabio Valentini <decathorpe@gmail.com> - 0:2.0-7.M9
+- Remove unnecessary dependency on parent POM.
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0~M10-2
+- Mass rebuild for javapackages-tools 201902
+
+* Wed Sep 18 2019 Marian Koncek <mkoncek@redhat.com> - 2.0~M10-1
+- Update to upstream version 2.0~M10
+
+* Sun Aug 18 2019 Fabio Valentini <decathorpe@gmail.com> - 0:2.0-6.M9
+- Port to jflex 1.7.0.
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-5.M9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Jun 07 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-5.M9
+- Port to JFlex 1.7.0
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-4.M9
+- Mass rebuild for javapackages-tools 201901
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-4.M9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 0:2.0-3.M9
+- Repack tarball to remove possibly proprietary binaries
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-2.M9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 05 2018 Michael Simacek <msimacek@redhat.com> - 0:2.0-1.M9
+- Update to upstream version 2.0-M9
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-0.12.M7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Mon Sep 25 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.0-0.11.M7
+- Elimitate race condition when injecting JAR manifest
+- Resolves: rhbz#1495243
+
+* Tue Sep 12 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.0-0.10.M7
+- Update to upstream version 2.0-M7
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-0.9.M5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-0.8.M5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Jan 20 2017 Michael Simacek <msimacek@redhat.com> - 0:2.0-0.7.M5
+- Backport patch for misparsed comments
+
+* Tue Jan 17 2017 Michael Simacek <msimacek@redhat.com> - 0:2.0-0.6.M5
+- Update to upstream version 2.0-M5
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-0.5.M3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Mon Jun 22 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.0-0.4.M3
+- Update to upstream version 2.0-M3
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.0-0.3.M2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue Mar 24 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.0-0.2.M2
+- Regenerate build-requires
+- Remove obsoletes on qdox-manual
+
+* Mon Oct 27 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.0-1.M2
+- Update to upstream version 2.0-M2
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.12.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu May 29 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.12.1-9
+- Build with %%mvn_build
+
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.12.1-8
+- Use Requires: java-headless rebuild (#1067528)
+
+* Mon Aug 12 2013 akurtakov <akurtakov@localhost.localdomain> 0:1.12.1-7
+- Fix FTBFS bug#993187 .
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.12.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Sat Feb 23 2013 Alexander Kurtakov <akurtako@redhat.com> 0:1.12.1-5
+- Remove wagon-webdav extension.
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.12.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 0:1.12.1-3
+- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+- Replace maven BuildRequires with maven-local
+
+* Wed Jan  9 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.12.1-2
+- Run jflex manually before Maven build is started
+- Resolves: rhbz#879653
+
+* Tue Dec 11 2012 Alexander Kurtakov <akurtako@redhat.com> 0:1.12.1-1
+- Update to latest upstream release.
+
+* Tue Nov 13 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.12-7
+- Add license to javadoc subpackage
+
+* Wed Aug 1 2012 Alexander Kurtakov <akurtako@redhat.com> 0:1.12-6
+- Inject osgi metadata from eclipse orbit.
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.12-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.12-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Fri Jun 10 2011 Alexander Kurtakov <akurtako@redhat.com> 0:1.12-3
+- Build with maven 3.x.
+- Adapt to current guidelines.
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Oct 5 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.12-1
+- Update to new version.
+
+* Mon Jun 7 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.11-3
+- Make sure to remove all yacc executables.
+
+* Mon Jun 7 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.11-2
+- Symlink byaccj to both yacc.linux and yacc.linux.x86_64 to keep it building as noarch.
+
+* Mon Mar 15 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.11-1
+- Update to 1.11.
+
+* Mon Feb 15 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.10.1-2
+- Rebuild for rhbz#565013.
+
+* Thu Jan 14 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.10.1-1
+- Update to upstream 1.10.1.
+
+* Sat Sep 19 2009 Alexander Kurtakov <akurtako@redhat.com> 0:1.9.2-2
+- Remove not needed sources.
+
+* Tue Aug 18 2009 Alexander Kurtakov <akurtako@redhat.com> 0:1.9.2-1
+- Update to 1.9.2.
+
+* Fri Apr 03 2009 Ralph Apel <r.apel at r-apel.de> 0:1.8-1.jpp5
+- 1.8 as qdox18 because of qdox frozen at 1.6.1 in JPP-5
+
+* Tue Jul 01 2008 Ralph Apel <r.apel at r-apel.de> 0:1.6.3-5.jpp5
+- Restore to devel
+- Drop mockobjects BR
+
+* Fri Jun 13 2008 Ralph Apel <r.apel at r-apel.de> 0:1.6.3-4.jpp5
+- Add com.thoughtworks.qdox groupId to depmap frag
+
+* Tue Feb 26 2008 Ralph Apel <r.apel at r-apel.de> 0:1.6.3-3jpp
+- Add settings file
+- Fix pom marking jmock dependency as of scope test
+- Fix -jpp-depmap.xml for asm2-parent
+
+* Mon Nov 26 2007 Ralph Apel <r.apel at r-apel.de> 0:1.6.3-2jpp
+- Fix maven macro value
+
+* Thu Nov 22 2007 Ralph Apel <r.apel at r-apel.de> 0:1.6.3-1jpp
+- Upgrade to 1.6.3
+
+* Wed May 30 2007 Ralph Apel <r.apel at r-apel.de> 0:1.6.2-1jpp
+- Upgrade to 1.6.2
+- Activate tests while building with ant
+- Make Vendor, Distribution based on macro
+- Install depmap frags, poms
+
+* Thu Mar 22 2007 Vivek Lakshmanan <vivekl@redhat.com> 0:1.6.1-1jpp.ep1.4
+- Rebuild with fixed component-info.xml
+
+* Fri Feb 23 2007 Ralph Apel <r.apel at r-apel.de> 0:1.5-3jpp
+- Add option to build without maven
+- Omit tests when building without maven
+- Add gcj_support option
+
+* Mon Feb 20 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.5-2jpp
+- Rebuild for JPP-1.7, adapting to maven-1.1
+
+* Wed Nov 16 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.5-1jpp
+- Upgrade to 1.5
+- Build is now done with maven and requires jflex and byaccj
+
+* Wed Aug 25 2004 Fernando Nasser <fnasser@redhat.com> - 0:1.4-3jpp
+- Rebuild with Ant 1.6.2
+
+* Fri Aug 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.4-2jpp
+- Upgrade to ant-1.6.X
+
+* Mon Jun 07 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.4-1jpp
+- Upgrade to 1.4
+- Drop Requires: mockobjects (Build/Test only)
+
+* Tue Feb 24 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.3-1jpp
+- First JPackage release
diff --git a/qdox.spec b/qdox.spec
index 2e7219a..5306db0 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -2,7 +2,7 @@
 
 Name:           qdox
 Version:        2.1.0
-Release:        5%{?dist}
+Release:        %autorelease
 Summary:        Extract class/interface/method definitions from sources
 License:        Apache-2.0
 URL:            https://github.com/paul-hammant/qdox
@@ -89,273 +89,4 @@ jar ufm target/%{name}-%{version}.jar %{SOURCE1}
 %license LICENSE.txt
 
 %changelog
-* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Thu Jul 04 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.0-4
-- Enable upstream test suite
-
-* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 2.1.0-3
-- Rebuilt for java-21-openjdk as system jdk
-
-* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 2.1.0-2
-- bump of release for for java-21-openjdk as system jdk
-
-* Fri Feb 02 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.0-1
-- Update to upstream version 2.1.0
-
-* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.3-2
-- Convert License tag to SPDX format
-
-* Thu Aug 17 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.3-1
-- Update to upstream version 2.0.3
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.0.0-9
-- Rebuilt for java-17-openjdk as system jdk
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.0-7
-- Set explicit Java compiler source/target levels to 1.7
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.0-5
-- Bootstrap build
-- Non-bootstrap build
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 0:2.0.0-2
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Wed Feb 26 2020 Marian Koncek <mkoncek@redhat.com> - 2.0.0-1
-- Update to upstream version 2.0.0
-
-* Thu Feb 13 2020 Fabio Valentini <decathorpe@gmail.com> - 0:2.0.0-1
-- Update to version 2.0.0.
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-8.M9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Nov 22 2019 Fabio Valentini <decathorpe@gmail.com> - 0:2.0-7.M9
-- Remove unnecessary dependency on parent POM.
-
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0~M10-2
-- Mass rebuild for javapackages-tools 201902
-
-* Wed Sep 18 2019 Marian Koncek <mkoncek@redhat.com> - 2.0~M10-1
-- Update to upstream version 2.0~M10
-
-* Sun Aug 18 2019 Fabio Valentini <decathorpe@gmail.com> - 0:2.0-6.M9
-- Port to jflex 1.7.0.
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-5.M9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Jun 07 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-5.M9
-- Port to JFlex 1.7.0
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-4.M9
-- Mass rebuild for javapackages-tools 201901
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-4.M9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 0:2.0-3.M9
-- Repack tarball to remove possibly proprietary binaries
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-2.M9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 05 2018 Michael Simacek <msimacek@redhat.com> - 0:2.0-1.M9
-- Update to upstream version 2.0-M9
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-0.12.M7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Sep 25 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.0-0.11.M7
-- Elimitate race condition when injecting JAR manifest
-- Resolves: rhbz#1495243
-
-* Tue Sep 12 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.0-0.10.M7
-- Update to upstream version 2.0-M7
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-0.9.M5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-0.8.M5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Jan 20 2017 Michael Simacek <msimacek@redhat.com> - 0:2.0-0.7.M5
-- Backport patch for misparsed comments
-
-* Tue Jan 17 2017 Michael Simacek <msimacek@redhat.com> - 0:2.0-0.6.M5
-- Update to upstream version 2.0-M5
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-0.5.M3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Jun 22 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.0-0.4.M3
-- Update to upstream version 2.0-M3
-
-* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.0-0.3.M2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue Mar 24 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.0-0.2.M2
-- Regenerate build-requires
-- Remove obsoletes on qdox-manual
-
-* Mon Oct 27 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.0-1.M2
-- Update to upstream version 2.0-M2
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.12.1-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Thu May 29 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.12.1-9
-- Build with %%mvn_build
-
-* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.12.1-8
-- Use Requires: java-headless rebuild (#1067528)
-
-* Mon Aug 12 2013 akurtakov <akurtakov@localhost.localdomain> 0:1.12.1-7
-- Fix FTBFS bug#993187 .
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.12.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Sat Feb 23 2013 Alexander Kurtakov <akurtako@redhat.com> 0:1.12.1-5
-- Remove wagon-webdav extension.
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.12.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 0:1.12.1-3
-- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
-- Replace maven BuildRequires with maven-local
-
-* Wed Jan  9 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.12.1-2
-- Run jflex manually before Maven build is started
-- Resolves: rhbz#879653
-
-* Tue Dec 11 2012 Alexander Kurtakov <akurtako@redhat.com> 0:1.12.1-1
-- Update to latest upstream release.
-
-* Tue Nov 13 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.12-7
-- Add license to javadoc subpackage
-
-* Wed Aug 1 2012 Alexander Kurtakov <akurtako@redhat.com> 0:1.12-6
-- Inject osgi metadata from eclipse orbit.
-
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.12-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.12-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Fri Jun 10 2011 Alexander Kurtakov <akurtako@redhat.com> 0:1.12-3
-- Build with maven 3.x.
-- Adapt to current guidelines.
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.12-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Oct 5 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.12-1
-- Update to new version.
-
-* Mon Jun 7 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.11-3
-- Make sure to remove all yacc executables.
-
-* Mon Jun 7 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.11-2
-- Symlink byaccj to both yacc.linux and yacc.linux.x86_64 to keep it building as noarch.
-
-* Mon Mar 15 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.11-1
-- Update to 1.11.
-
-* Mon Feb 15 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.10.1-2
-- Rebuild for rhbz#565013.
-
-* Thu Jan 14 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.10.1-1
-- Update to upstream 1.10.1.
-
-* Sat Sep 19 2009 Alexander Kurtakov <akurtako@redhat.com> 0:1.9.2-2
-- Remove not needed sources.
-
-* Tue Aug 18 2009 Alexander Kurtakov <akurtako@redhat.com> 0:1.9.2-1
-- Update to 1.9.2.
-
-* Fri Apr 03 2009 Ralph Apel <r.apel at r-apel.de> 0:1.8-1.jpp5
-- 1.8 as qdox18 because of qdox frozen at 1.6.1 in JPP-5
-
-* Tue Jul 01 2008 Ralph Apel <r.apel at r-apel.de> 0:1.6.3-5.jpp5
-- Restore to devel
-- Drop mockobjects BR
-
-* Fri Jun 13 2008 Ralph Apel <r.apel at r-apel.de> 0:1.6.3-4.jpp5
-- Add com.thoughtworks.qdox groupId to depmap frag
-
-* Tue Feb 26 2008 Ralph Apel <r.apel at r-apel.de> 0:1.6.3-3jpp
-- Add settings file
-- Fix pom marking jmock dependency as of scope test
-- Fix -jpp-depmap.xml for asm2-parent
-
-* Mon Nov 26 2007 Ralph Apel <r.apel at r-apel.de> 0:1.6.3-2jpp
-- Fix maven macro value
-
-* Thu Nov 22 2007 Ralph Apel <r.apel at r-apel.de> 0:1.6.3-1jpp
-- Upgrade to 1.6.3
-
-* Wed May 30 2007 Ralph Apel <r.apel at r-apel.de> 0:1.6.2-1jpp
-- Upgrade to 1.6.2
-- Activate tests while building with ant
-- Make Vendor, Distribution based on macro
-- Install depmap frags, poms
-
-* Thu Mar 22 2007 Vivek Lakshmanan <vivekl@redhat.com> 0:1.6.1-1jpp.ep1.4
-- Rebuild with fixed component-info.xml
-
-* Fri Feb 23 2007 Ralph Apel <r.apel at r-apel.de> 0:1.5-3jpp
-- Add option to build without maven
-- Omit tests when building without maven
-- Add gcj_support option
-
-* Mon Feb 20 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.5-2jpp
-- Rebuild for JPP-1.7, adapting to maven-1.1
-
-* Wed Nov 16 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.5-1jpp
-- Upgrade to 1.5
-- Build is now done with maven and requires jflex and byaccj
-
-* Wed Aug 25 2004 Fernando Nasser <fnasser@redhat.com> - 0:1.4-3jpp
-- Rebuild with Ant 1.6.2
-
-* Fri Aug 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.4-2jpp
-- Upgrade to ant-1.6.X
-
-* Mon Jun 07 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.4-1jpp
-- Upgrade to 1.4
-- Drop Requires: mockobjects (Build/Test only)
-
-* Tue Feb 24 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.3-1jpp
-- First JPackage release
+%autochangelog

From 25b5a49f109ed46b97296f1b069f4025127f7b98 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 29 Nov 2024 08:28:39 +0100
Subject: [PATCH 18/27] 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 2ee20226ab52d770a22f7678379d3a84e9c04f2f Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 31 Dec 2024 09:59:11 +0100
Subject: [PATCH 19/27] Update javadoc package description [skip changelog]

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

diff --git a/qdox.spec b/qdox.spec
index 5306db0..fac0afe 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -36,10 +36,10 @@ It is designed to be used by active code
 generators or documentation tools.
 
 %package javadoc
-Summary:        Javadoc for %{name}
+Summary:        API documentation for %{name}
 
 %description javadoc
-API docs for %{name}.
+API documentation for %{name}.
 
 %prep
 %autosetup -p1 -C

From 5300ac600f3cca8a29f5d465efed9db0c50dcd1a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 18 Jan 2025 21:17:29 +0000
Subject: [PATCH 20/27] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild


From c0951aeae229af107797fc381379662bab0f3443 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 19 Feb 2025 08:01:48 +0100
Subject: [PATCH 21/27] Use %jar macro

The %jar macro invokes jar from %java_home, while plain jar invocations relies on PATH.
---
 qdox.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qdox.spec b/qdox.spec
index fac0afe..b4c7a3a 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -76,7 +76,7 @@ jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexe
 %mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
 
 # Inject OSGi manifests
-jar ufm target/%{name}-%{version}.jar %{SOURCE1}
+%jar ufm target/%{name}-%{version}.jar %{SOURCE1}
 
 %install
 %mvn_install

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

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

diff --git a/qdox.spec b/qdox.spec
index b4c7a3a..121287d 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -27,6 +27,8 @@ BuildRequires:  mvn(org.assertj:assertj-core)
 BuildRequires:  mvn(org.junit.jupiter:junit-jupiter)
 BuildRequires:  mvn(org.mockito:mockito-core)
 %endif
+# TODO Remove in Fedora 46
+Obsoletes:      %{name}-javadoc < 2.1.0-15
 
 %description
 QDox is a high speed, small footprint parser
@@ -35,12 +37,6 @@ from source files complete with JavaDoc @tags.
 It is designed to be used by active code
 generators or documentation tools.
 
-%package javadoc
-Summary:        API documentation for %{name}
-
-%description javadoc
-API documentation for %{name}.
-
 %prep
 %autosetup -p1 -C
 
@@ -73,7 +69,7 @@ jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexe
 )
 
 # Build artifact
-%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
+%mvn_build -j -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
 
 # Inject OSGi manifests
 %jar ufm target/%{name}-%{version}.jar %{SOURCE1}
@@ -85,8 +81,5 @@ jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexe
 %license LICENSE.txt
 %doc README.md
 
-%files javadoc -f .mfiles-javadoc
-%license LICENSE.txt
-
 %changelog
 %autochangelog

From 8869a6cf4ab02fe5fefce506f9943c7edc16ebda Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 26 Mar 2025 08:43:19 +0100
Subject: [PATCH 23/27] 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 64c74414b4a45ea417a6f6aafe2ca6af6dedc120 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 22 May 2025 13:35:32 +0200
Subject: [PATCH 24/27] 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 8f37747e618a9fd1fe89f80d23544de6b8b7c82c Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sun, 13 Jul 2025 09:22:52 +0200
Subject: [PATCH 25/27] Build with OpenJDK 25

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

diff --git a/qdox.spec b/qdox.spec
index 121287d..12e3cde 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -21,7 +21,7 @@ BuildRequires:  byaccj
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  maven-local
+BuildRequires:  maven-local-openjdk25
 BuildRequires:  jflex
 BuildRequires:  mvn(org.assertj:assertj-core)
 BuildRequires:  mvn(org.junit.jupiter:junit-jupiter)

From 0e26679f95d6773d4ca3efefde3285209c633f24 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 11:23:37 +0000
Subject: [PATCH 26/27] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From 729d1479ae527ab3838a38989e3ab332b3e8f7d5 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Wed, 30 Jul 2025 01:11:51 +0200
Subject: [PATCH 27/27] 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.