Sync from SUSE:SLFO:Main qdox revision e095d6386e6328b3493c9be5a175294e

qdox-build.xml

@@ -9,7 +9,7 @@
   <property file="build.properties"/>
 
   <property name="project.artifactId" value="qdox"/>
-  <property name="project.version" value="2.0.3"/>
+  <!-- <property name="project.version" value="2.1.0"/> -->
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
   <property name="build.dir" value="target"/>

qdox.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Wed Apr 10 14:08:25 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Update to version 2.1.
+  * Changes:
+    + clarify getComment() javadoc with regards to Standard doclet
+      inline and 
+    + Require Java 8 to run QDox (#171) 
+    + Replace hamcrest with assertj (#173)
+    + Upgrade to Mockito 4.11.0 with some small required code
+      changes (#174)
+    + implement JavaWildcardType.getLowerBounds and
+      JavaWildcardType.getUpperBounds 
+    + Fix unittests
+    + maven-gpg-plugin is not a managed plugin in oss-parent, move
+      it to build.plugins
+    + Fix the bug that does not allow the use of permits as field
+      names (#202)
+
+-------------------------------------------------------------------
+Tue Feb 20 13:46:33 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Use %patch -P N instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Thu Sep 21 05:55:13 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

qdox.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package qdox
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           qdox
-Version:        2.0.3
+Version:        2.1.0
 Release:        0
 Summary:        Tool to extract class/interface/method definitions from sources
 License:        Apache-2.0
@@ -31,7 +31,7 @@ BuildRequires:  byaccj
 BuildRequires:  fdupes
 BuildRequires:  java-cup-bootstrap
 BuildRequires:  java-devel
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  jflex-bootstrap
 BuildArch:      noarch
 
@@ -50,7 +50,7 @@ API docs for %{name}.
 %prep
 %setup -q
 cp %{SOURCE1} build.xml
-%patch0 -p1
+%patch -P 0 -p1
 find -name *.jar -delete
 find -name *.class -delete
 rm -rf bootstrap
@@ -76,7 +76,7 @@ jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexe
  byaccj -v -Jnorun -Jnoconstruct -Jclass=Parser -Jimplements=CommentHandler -Jsemantic=Value -Jpackage=com.thoughtworks.qdox.parser.impl -Jstack=500 ../../../../../../../grammar/parser.y
 )
 
-%ant jar javadoc
+%ant -Dproject.version=%{version} jar javadoc
 
 %install
 # jar
@@ -84,7 +84,7 @@ install -dm 0755 %{buildroot}%{_javadir}
 install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}
-install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
 %add_maven_depmap %{name}.pom %{name}.jar -a qdox:qdox
 # javadoc
 mkdir -p %{buildroot}%{_javadocdir}/%{name}