diff --git a/qdox-2.0.3-project.tar.bz2 b/qdox-2.0.3-project.tar.bz2 deleted file mode 100644 index 69ca8a9..0000000 --- a/qdox-2.0.3-project.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74ecec80836707d1132ade7c060d7136f5da387894c5fc8a91bd7805002535c0 -size 502433 diff --git a/qdox-2.1.0-project.tar.bz2 b/qdox-2.1.0-project.tar.bz2 new file mode 100644 index 0000000..696d716 --- /dev/null +++ b/qdox-2.1.0-project.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c92556c5d8635b110f1915b3b87307854d48f93ed2de4d0c376915884691f30 +size 501277 diff --git a/qdox-build.xml b/qdox-build.xml index 47c95ae..b28ebfe 100644 --- a/qdox-build.xml +++ b/qdox-build.xml @@ -9,7 +9,7 @@ - + diff --git a/qdox.changes b/qdox.changes index e140c94..40f81d5 100644 --- a/qdox.changes +++ b/qdox.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Wed Apr 10 14:08:25 UTC 2024 - Fridrich Strba + +- 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 + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Thu Sep 21 05:55:13 UTC 2023 - Fridrich Strba diff --git a/qdox.spec b/qdox.spec index a0e5ce2..9743b10 100644 --- a/qdox.spec +++ b/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}