.gitignore

@@ -1 +1 @@
-SOURCES/qdox-2.0.0.tar.gz
+SOURCES/qdox-2.1.0.tar.gz

.qdox.metadata

@@ -1 +1 @@
-7ee11d8c5264431d3a670ceaa29bc19435ed9772 SOURCES/qdox-2.0.0.tar.gz
+394cf684ad344d4a366944fe1b4169fcc9bb7d9c SOURCES/qdox-2.1.0.tar.gz

SOURCES/0001-Port-to-JFlex-1.7.0.patch

@@ -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
-

SOURCES/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

SPECS/qdox.spec

@@ -1,14 +1,13 @@
 %bcond_with bootstrap
 
-%global upstream_version %(echo %{version} | tr '~' '-')
-
 Name:           qdox
-Version:        2.0.0
+Version:        2.1.0
-Release:        8%{?dist}
+Release:        6%{?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
 
 # ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
@@ -16,14 +15,17 @@ Source1:        qdox-MANIFEST.MF
 # Remove bundled binaries which are possibly proprietary
 Source2:        generate-tarball.sh
 
-Patch0:         0001-Port-to-JFlex-1.7.0.patch
+Patch0:         qdox-port-tests-to-java-21.patch
 
-BuildRequires:  maven-local
 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
@@ -40,8 +42,8 @@ Summary:        Javadoc for %{name}
 API docs for %{name}.
 
 %prep
-%setup -q -n %{name}-%{upstream_version}
+%setup -q
-%patch0 -p1
+%patch 0 -p1
 
 # remove unnecessary dependency on parent POM
 %pom_remove_parent
@@ -51,7 +53,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
 
@@ -72,10 +74,10 @@ jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexe
 )
 
 # Build artifact
-%mvn_build -f
+%mvn_build -- -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
@@ -88,15 +90,58 @@ jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1}
 %license LICENSE.txt
 
 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.0.0-8
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.1.0-6
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Bump release for October 2024 mass rebuild:
-  Related: rhbz#1991688
+  Resolves: RHEL-64018
+
+* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.1.0-5
+- Rebuilt for MSVSphere 10
+
+* Mon Aug 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.0-5
+- Port to OpenJDK 21
+- Resolves: RHEL-52713
+
+* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 2.1.0-3
+- Bump release for Aug 2024 java mass rebuild
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.1.0-2
+- Bump release for June 2024 mass rebuild
+
+* 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
 
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.0-7
+* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.0-7
-- Rebuild to workaround DistroBaker issue
+- Set explicit Java compiler source/target levels to 1.7
 
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.0-6
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-6
-- Bootstrap Maven for CentOS Stream 9
+- 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