From ccf7cb7830bd9f0ac29bc68e0dcf17a575d20415 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 13:02:12 +0000 Subject: [PATCH 01/52] Remove explicit Epoch --- qdox.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/qdox.spec b/qdox.spec index ef7ca09..e19f68a 100644 --- a/qdox.spec +++ b/qdox.spec @@ -4,7 +4,6 @@ Summary: Extract class/interface/method definitions from sources Name: qdox Version: 2.0 Release: 3.%{vertag}%{?dist} -Epoch: 0 License: ASL 2.0 URL: https://github.com/paul-hammant/qdox BuildArch: noarch From 084ef10191d825502e6070b77294d26b6b6c9e28 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:39 +0200 Subject: [PATCH 02/52] Mass rebuild for javapackages-tools 201901 --- qdox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qdox.spec b/qdox.spec index e19f68a..a44080a 100644 --- a/qdox.spec +++ b/qdox.spec @@ -3,7 +3,7 @@ Summary: Extract class/interface/method definitions from sources Name: qdox Version: 2.0 -Release: 3.%{vertag}%{?dist} +Release: 4.%{vertag}%{?dist} License: ASL 2.0 URL: https://github.com/paul-hammant/qdox BuildArch: noarch @@ -75,6 +75,9 @@ jar ufm target/%{name}-%{version}*.jar %{SOURCE1} %doc LICENSE.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 2.0-4.M9 +- Mass rebuild for javapackages-tools 201901 + * Tue Jul 31 2018 Michael Simacek - 0:2.0-3.M9 - Repack tarball to remove possibly proprietary binaries From 992e3f8df123fd63b16da6c4dab7bd52bc1544b5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 7 Jun 2019 09:49:41 +0200 Subject: [PATCH 03/52] Don't use deprecated inputstreamctor option --- qdox.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/qdox.spec b/qdox.spec index a44080a..237c5ac 100644 --- a/qdox.spec +++ b/qdox.spec @@ -3,7 +3,7 @@ Summary: Extract class/interface/method definitions from sources Name: qdox Version: 2.0 -Release: 4.%{vertag}%{?dist} +Release: 5.%{vertag}%{?dist} License: ASL 2.0 URL: https://github.com/paul-hammant/qdox BuildArch: noarch @@ -56,8 +56,8 @@ rm -rf bootstrap %build # Generate scanners (upstream does this with maven-jflex-plugin) -jflex --inputstreamctor -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/lexer.flex -jflex --inputstreamctor -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexer.flex +jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/lexer.flex +jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexer.flex # Build artifact %mvn_build -f -- -Dqdox.byaccj.executable=byaccj @@ -75,6 +75,9 @@ jar ufm target/%{name}-%{version}*.jar %{SOURCE1} %doc LICENSE.txt %changelog +* Fri Jun 07 2019 Mikolaj Izdebski - 2.0-5.M9 +- Don't use deprecated inputstreamctor option + * Fri May 24 2019 Mikolaj Izdebski - 2.0-4.M9 - Mass rebuild for javapackages-tools 201901 From 256bc86d4e0714e0c84a1933db4c4a9c17a863e5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 7 Jun 2019 10:02:22 +0200 Subject: [PATCH 04/52] Make the code compile with JFlex 1.7 --- qdox.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qdox.spec b/qdox.spec index 237c5ac..ad0f4d4 100644 --- a/qdox.spec +++ b/qdox.spec @@ -54,6 +54,10 @@ rm -rf bootstrap %pom_xpath_set pom:workingDirectory '${basedir}/src/main/java/com/thoughtworks/qdox/parser/impl' +# Compatibility with JFlex 1.7.0 +sed -i 's/JFlexLexer(\(.*\))/JFlexLexer(new java.io.InputStreamReader((\1), java.nio.charset.Charset.forName("UTF-8")))/' \ + src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java + %build # Generate scanners (upstream does this with maven-jflex-plugin) jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/lexer.flex From 456c83d1c957ae6986f981e2cdbbd26b47038ca5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 7 Jun 2019 10:40:23 +0200 Subject: [PATCH 05/52] Port to JFlex 1.7.0 --- 0001-Port-to-JFlex-1.7.0.patch | 39 ++++++++++++++++++++++++++++++++++ qdox.spec | 8 +++---- 2 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 0001-Port-to-JFlex-1.7.0.patch diff --git a/0001-Port-to-JFlex-1.7.0.patch b/0001-Port-to-JFlex-1.7.0.patch new file mode 100644 index 0000000..441858b --- /dev/null +++ b/0001-Port-to-JFlex-1.7.0.patch @@ -0,0 +1,39 @@ +From 31f530b26bd4625ffe41aa16c48836455ef81c23 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +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 ad0f4d4..7b35e0a 100644 --- a/qdox.spec +++ b/qdox.spec @@ -14,6 +14,7 @@ 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: maven-local BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) @@ -40,6 +41,7 @@ API docs for %{name}. %prep %setup -q -n %{name}-%{version}-%{vertag} +%patch0 -p1 find -name *.jar -delete rm -rf bootstrap @@ -54,10 +56,6 @@ rm -rf bootstrap %pom_xpath_set pom:workingDirectory '${basedir}/src/main/java/com/thoughtworks/qdox/parser/impl' -# Compatibility with JFlex 1.7.0 -sed -i 's/JFlexLexer(\(.*\))/JFlexLexer(new java.io.InputStreamReader((\1), java.nio.charset.Charset.forName("UTF-8")))/' \ - src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java - %build # Generate scanners (upstream does this with maven-jflex-plugin) jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/lexer.flex @@ -80,7 +78,7 @@ jar ufm target/%{name}-%{version}*.jar %{SOURCE1} %changelog * Fri Jun 07 2019 Mikolaj Izdebski - 2.0-5.M9 -- Don't use deprecated inputstreamctor option +- Port to JFlex 1.7.0 * Fri May 24 2019 Mikolaj Izdebski - 2.0-4.M9 - Mass rebuild for javapackages-tools 201901 From edef7d98bb5b4c58ca3de8243f1f1b21570b65a3 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 18 Sep 2019 14:29:42 +0200 Subject: [PATCH 06/52] Update to upstream version 2.0~M10 --- .gitignore | 1 + generate-tarball.sh | 9 ++++----- qdox.spec | 19 +++++++++---------- sources | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 02ce7c3..77ef64d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ qdox-1.12-project.tar.bz2 /qdox-2.0-M7-project.tar.gz /qdox-2.0-M9-project.tar.gz /qdox-2.0-M9.tar.gz +/qdox-2.0~M10.tar.gz diff --git a/generate-tarball.sh b/generate-tarball.sh index 7e63681..6fb2053 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -3,15 +3,14 @@ set -e name=qdox version="$(sed -n 's/Version:\s*//p' *.spec)" -vertag="$(sed -n 's/%global\s*vertag\s*//p' *.spec)" # RETRIEVE -wget "http://repo2.maven.org/maven2/com/thoughtworks/qdox/qdox/${version}-${vertag}/${name}-${version}-${vertag}-project.tar.gz" -O "${name}-${version}-${vertag}.orig.tar.gz" +wget "http://repo2.maven.org/maven2/com/thoughtworks/qdox/qdox/${version/'~'/'-'}/${name}-${version/'~'/'-'}-project.tar.gz" -O "${name}-${version}.orig.tar.gz" rm -rf tarball-tmp mkdir tarball-tmp cd tarball-tmp -tar xf "../${name}-${version}-${vertag}.orig.tar.gz" +tar xf "../${name}-${version}.orig.tar.gz" # CLEAN TARBALL find -name '*.jar' -delete @@ -19,6 +18,6 @@ find -name '*.class' -delete # contains possibly proprietary binaries of YACC rm -r */bootstrap -tar cf "../${name}-${version}-${vertag}.tar.gz" * +tar cf "../${name}-${version}.tar.gz" * cd .. -rm -r tarball-tmp "${name}-${version}-${vertag}.orig.tar.gz" +rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/qdox.spec b/qdox.spec index 7b35e0a..e320342 100644 --- a/qdox.spec +++ b/qdox.spec @@ -1,15 +1,13 @@ -%global vertag M9 - -Summary: Extract class/interface/method definitions from sources Name: qdox -Version: 2.0 -Release: 5.%{vertag}%{?dist} +Version: 2.0~M10 +Release: 1%{?dist} +Summary: Extract class/interface/method definitions from sources License: ASL 2.0 URL: https://github.com/paul-hammant/qdox BuildArch: noarch # ./generate-tarball.sh -Source0: %{name}-%{version}-%{vertag}.tar.gz +Source0: %{name}-%{version}.tar.gz Source1: qdox-MANIFEST.MF # Remove bundled binaries which are possibly proprietary Source2: generate-tarball.sh @@ -38,12 +36,9 @@ Summary: Javadoc for %{name} %description javadoc API docs for %{name}. - %prep -%setup -q -n %{name}-%{version}-%{vertag} +%setup -q -n %{name}-%(echo %{version} | tr '~' '-') %patch0 -p1 -find -name *.jar -delete -rm -rf bootstrap # We don't need these plugins %pom_remove_plugin :animal-sniffer-maven-plugin @@ -65,6 +60,7 @@ jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexe %mvn_build -f -- -Dqdox.byaccj.executable=byaccj # Inject OSGi manifests +# Even if the version contains the ~ milestone, the output is the same jar ufm target/%{name}-%{version}*.jar %{SOURCE1} %install @@ -77,6 +73,9 @@ jar ufm target/%{name}-%{version}*.jar %{SOURCE1} %doc LICENSE.txt %changelog +* Wed Sep 18 2019 Marian Koncek - 2.0~M10-1 +- Update to upstream version 2.0~M10 + * Fri Jun 07 2019 Mikolaj Izdebski - 2.0-5.M9 - Port to JFlex 1.7.0 diff --git a/sources b/sources index 3d2be3a..bcfedc3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qdox-2.0-M9.tar.gz) = 739f80beb5c9096774923a29731a93754be9b6d434c2fcdaced70dd2f43f102041c53f6b405b88fa2482f3a8f4e8ede701ffc6b14dcbc77c5030c1e0060149f9 +SHA512 (qdox-2.0~M10.tar.gz) = f0f2c7f5d37bd4d4b20a41bdeb538a4ddb5c303c974a2c1b17be92fcd6875ddd9de2a629c8e724ecef7e318cfb993c8bf6a743fb6fcffc4a2a5cbb9ac4917560 From 84fd84a54d567d5f8229a477c721ad772369ab75 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 18 Sep 2019 15:01:39 +0200 Subject: [PATCH 07/52] Fix OSGI generation --- qdox.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qdox.spec b/qdox.spec index e320342..14a5db7 100644 --- a/qdox.spec +++ b/qdox.spec @@ -1,3 +1,5 @@ +%global upstream_version %(echo %{version} | tr '~' '-') + Name: qdox Version: 2.0~M10 Release: 1%{?dist} @@ -37,7 +39,7 @@ Summary: Javadoc for %{name} API docs for %{name}. %prep -%setup -q -n %{name}-%(echo %{version} | tr '~' '-') +%setup -q -n %{name}-%{upstream_version} %patch0 -p1 # We don't need these plugins @@ -60,8 +62,7 @@ jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexe %mvn_build -f -- -Dqdox.byaccj.executable=byaccj # Inject OSGi manifests -# Even if the version contains the ~ milestone, the output is the same -jar ufm target/%{name}-%{version}*.jar %{SOURCE1} +jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1} %install %mvn_install From d82dca5e37c6e27a4d325b1d3c7b8d834d43399e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 08/52] Mass rebuild for javapackages-tools 201902 --- qdox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qdox.spec b/qdox.spec index 14a5db7..089320a 100644 --- a/qdox.spec +++ b/qdox.spec @@ -2,7 +2,7 @@ Name: qdox Version: 2.0~M10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Extract class/interface/method definitions from sources License: ASL 2.0 URL: https://github.com/paul-hammant/qdox @@ -74,6 +74,9 @@ jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1} %doc LICENSE.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 2.0~M10-2 +- Mass rebuild for javapackages-tools 201902 + * Wed Sep 18 2019 Marian Koncek - 2.0~M10-1 - Update to upstream version 2.0~M10 From 01aff73b77bf64107bcdfc4ced46d14fbc51a6f8 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 27 Jan 2020 16:23:32 +0100 Subject: [PATCH 09/52] Properly compress tarballs --- generate-tarball.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/generate-tarball.sh b/generate-tarball.sh index 6fb2053..5e841b3 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -9,7 +9,7 @@ wget "http://repo2.maven.org/maven2/com/thoughtworks/qdox/qdox/${version/'~'/'-' rm -rf tarball-tmp mkdir tarball-tmp -cd tarball-tmp +pushd tarball-tmp tar xf "../${name}-${version}.orig.tar.gz" # CLEAN TARBALL @@ -18,6 +18,6 @@ find -name '*.class' -delete # contains possibly proprietary binaries of YACC rm -r */bootstrap -tar cf "../${name}-${version}.tar.gz" * -cd .. +tar -czf "../${name}-${version}.tar.gz" * +popd rm -r tarball-tmp "${name}-${version}.orig.tar.gz" From b4fa8dfdffe7d346888b7f234aea3074e40a717c Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 26 Feb 2020 14:34:04 +0100 Subject: [PATCH 10/52] Update to upstream version 2.0.0 --- .gitignore | 1 + generate-tarball.sh | 4 ++-- qdox.spec | 12 ++++++++---- sources | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 77ef64d..b55a586 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ qdox-1.12-project.tar.bz2 /qdox-2.0-M9-project.tar.gz /qdox-2.0-M9.tar.gz /qdox-2.0~M10.tar.gz +/qdox-2.0.0.tar.gz diff --git a/generate-tarball.sh b/generate-tarball.sh index 5e841b3..dea833b 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -5,12 +5,12 @@ name=qdox version="$(sed -n 's/Version:\s*//p' *.spec)" # RETRIEVE -wget "http://repo2.maven.org/maven2/com/thoughtworks/qdox/qdox/${version/'~'/'-'}/${name}-${version/'~'/'-'}-project.tar.gz" -O "${name}-${version}.orig.tar.gz" +wget "https://repo1.maven.org/maven2/com/thoughtworks/qdox/qdox/${version/'~'/'-'}/${name}-${version/'~'/'-'}-project.tar.gz" -O "${name}-${version}.orig.tar.gz" rm -rf tarball-tmp mkdir tarball-tmp pushd tarball-tmp -tar xf "../${name}-${version}.orig.tar.gz" +tar -xf "../${name}-${version}.orig.tar.gz" # CLEAN TARBALL find -name '*.jar' -delete diff --git a/qdox.spec b/qdox.spec index 089320a..c59c361 100644 --- a/qdox.spec +++ b/qdox.spec @@ -1,8 +1,8 @@ %global upstream_version %(echo %{version} | tr '~' '-') Name: qdox -Version: 2.0~M10 -Release: 2%{?dist} +Version: 2.0.0 +Release: 1%{?dist} Summary: Extract class/interface/method definitions from sources License: ASL 2.0 URL: https://github.com/paul-hammant/qdox @@ -68,12 +68,16 @@ jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1} %mvn_install %files -f .mfiles -%doc LICENSE.txt README.md +%license LICENSE.txt +%doc README.md %files javadoc -f .mfiles-javadoc -%doc LICENSE.txt +%license LICENSE.txt %changelog +* Wed Feb 26 2020 Marian Koncek - 2.0.0-1 +- Update to upstream version 2.0.0 + * Tue Nov 05 2019 Mikolaj Izdebski - 2.0~M10-2 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index bcfedc3..36d0ac0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qdox-2.0~M10.tar.gz) = f0f2c7f5d37bd4d4b20a41bdeb538a4ddb5c303c974a2c1b17be92fcd6875ddd9de2a629c8e724ecef7e318cfb993c8bf6a743fb6fcffc4a2a5cbb9ac4917560 +SHA512 (qdox-2.0.0.tar.gz) = 2ea7bd97ca720856a3f61aa12d4ec681708b599fe87c8942ac19e41b59cb56d3583f0953dc280d6244334d19762b7fe0c5693ee7acbaff2a4b421a3c959139b6 From e36a51727b5574eab96eef4a04bddda591e7cb79 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 21 Apr 2020 05:49:29 +0200 Subject: [PATCH 11/52] Drop dependency maven-invoker-plugin --- qdox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qdox.spec b/qdox.spec index c59c361..7076dfe 100644 --- a/qdox.spec +++ b/qdox.spec @@ -18,7 +18,6 @@ Patch0: 0001-Port-to-JFlex-1.7.0.patch BuildRequires: maven-local BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin) BuildRequires: mvn(org.codehaus.mojo:exec-maven-plugin) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) @@ -45,6 +44,7 @@ API docs for %{name}. # We don't need these plugins %pom_remove_plugin :animal-sniffer-maven-plugin %pom_remove_plugin :maven-failsafe-plugin +%pom_remove_plugin :maven-invoker-plugin %pom_remove_plugin :maven-jflex-plugin %pom_remove_plugin :maven-enforcer-plugin From f7eb4eb5716bac86bf328b1df1c0006046489ab8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 23 Apr 2020 13:20:41 +0200 Subject: [PATCH 12/52] Remove use of exec-maven-plugin --- qdox.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/qdox.spec b/qdox.spec index 7076dfe..6012993 100644 --- a/qdox.spec +++ b/qdox.spec @@ -18,7 +18,6 @@ Patch0: 0001-Port-to-JFlex-1.7.0.patch BuildRequires: maven-local BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) -BuildRequires: mvn(org.codehaus.mojo:exec-maven-plugin) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) BuildRequires: byaccj @@ -47,19 +46,24 @@ API docs for %{name}. %pom_remove_plugin :maven-invoker-plugin %pom_remove_plugin :maven-jflex-plugin %pom_remove_plugin :maven-enforcer-plugin +%pom_remove_plugin :exec-maven-plugin %mvn_file : %{name} %mvn_alias : qdox:qdox -%pom_xpath_set pom:workingDirectory '${basedir}/src/main/java/com/thoughtworks/qdox/parser/impl' - %build # Generate scanners (upstream does this with maven-jflex-plugin) jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/lexer.flex jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexer.flex +# Generate parsers (upstream does this with exec-maven-plugin) +(cd ./src/main/java/com/thoughtworks/qdox/parser/impl + byaccj -v -Jnorun -Jnoconstruct -Jclass=DefaultJavaCommentParser -Jpackage=com.thoughtworks.qdox.parser.impl ../../../../../../../grammar/commentparser.y + byaccj -v -Jnorun -Jnoconstruct -Jclass=Parser -Jimplements=CommentHandler -Jsemantic=Value -Jpackage=com.thoughtworks.qdox.parser.impl -Jstack=500 ../../../../../../../grammar/parser.y +) + # Build artifact -%mvn_build -f -- -Dqdox.byaccj.executable=byaccj +%mvn_build -f # Inject OSGi manifests jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1} From 7a2c7629ef541068732dba90238ecf59457c7e06 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 18 May 2020 16:42:50 +0200 Subject: [PATCH 13/52] Remove dependency on maven-assembly-plugin --- qdox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qdox.spec b/qdox.spec index 6012993..12ac045 100644 --- a/qdox.spec +++ b/qdox.spec @@ -17,7 +17,6 @@ Source2: generate-tarball.sh Patch0: 0001-Port-to-JFlex-1.7.0.patch BuildRequires: maven-local -BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) BuildRequires: byaccj @@ -42,6 +41,7 @@ API docs for %{name}. # We don't need these plugins %pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :maven-assembly-plugin %pom_remove_plugin :maven-failsafe-plugin %pom_remove_plugin :maven-invoker-plugin %pom_remove_plugin :maven-jflex-plugin From 9c28b8103801c0e2ad1a231fa25cc35655d0a5ec Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:13 +0200 Subject: [PATCH 14/52] Conditionalize buildrequires in bootstrap mode --- qdox.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/qdox.spec b/qdox.spec index 12ac045..2d11af1 100644 --- a/qdox.spec +++ b/qdox.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + %global upstream_version %(echo %{version} | tr '~' '-') Name: qdox @@ -17,10 +19,13 @@ Source2: generate-tarball.sh Patch0: 0001-Port-to-JFlex-1.7.0.patch BuildRequires: maven-local -BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) - BuildRequires: byaccj +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: jflex +BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) +%endif %description QDox is a high speed, small footprint parser From b563d6f9893c17c8704379b891abbd256aab47c2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 18:39:22 +0200 Subject: [PATCH 15/52] Set PATH when calling jflex in bootstrap mode --- qdox.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qdox.spec b/qdox.spec index 2d11af1..bbb3c2f 100644 --- a/qdox.spec +++ b/qdox.spec @@ -57,6 +57,8 @@ API docs for %{name}. %mvn_alias : qdox:qdox %build +%{?jpb_env} + # Generate scanners (upstream does this with maven-jflex-plugin) jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/lexer.flex jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexer.flex From bad386b93c101b3d8a1658aa4914aca385bc2832 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:43 +0200 Subject: [PATCH 16/52] Turn off bootstrap mode by default --- qdox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qdox.spec b/qdox.spec index bbb3c2f..0a025de 100644 --- a/qdox.spec +++ b/qdox.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap %global upstream_version %(echo %{version} | tr '~' '-') From 6ff9d0e6629e486a1628e7d5d230a582e62a669c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 15:50:44 +0200 Subject: [PATCH 17/52] Bootstrap build --- qdox.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qdox.spec b/qdox.spec index 58c0ebc..38fdab0 100644 --- a/qdox.spec +++ b/qdox.spec @@ -1,10 +1,10 @@ -%bcond_with bootstrap +%bcond_without bootstrap %global upstream_version %(echo %{version} | tr '~' '-') Name: qdox Version: 2.0.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Extract class/interface/method definitions from sources License: ASL 2.0 URL: https://github.com/paul-hammant/qdox @@ -88,6 +88,9 @@ jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1} %license LICENSE.txt %changelog +* Mon May 17 2021 Mikolaj Izdebski - 2.0.0-5 +- Bootstrap build + * Wed Jan 27 2021 Fedora Release Engineering - 0:2.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From d9ae3a684dc7d4eb5858fe1d380db83f64b34b53 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 18:01:49 +0200 Subject: [PATCH 18/52] Non-bootstrap build --- qdox.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qdox.spec b/qdox.spec index 38fdab0..85f4b32 100644 --- a/qdox.spec +++ b/qdox.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap %global upstream_version %(echo %{version} | tr '~' '-') @@ -90,6 +90,7 @@ jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1} %changelog * Mon May 17 2021 Mikolaj Izdebski - 2.0.0-5 - Bootstrap build +- Non-bootstrap build * Wed Jan 27 2021 Fedora Release Engineering - 0:2.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 2073f6f054abdcaf60046b9b7b5c0a0f43920980 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 10:37:45 +0000 Subject: [PATCH 19/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qdox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qdox.spec b/qdox.spec index 85f4b32..6e0085f 100644 --- a/qdox.spec +++ b/qdox.spec @@ -4,7 +4,7 @@ Name: qdox Version: 2.0.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Extract class/interface/method definitions from sources License: ASL 2.0 URL: https://github.com/paul-hammant/qdox @@ -88,6 +88,9 @@ jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1} %license LICENSE.txt %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon May 17 2021 Mikolaj Izdebski - 2.0.0-5 - Bootstrap build - Non-bootstrap build From 85e8f559f7eb3f9f25e06a67991379b7b6608158 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 Nov 2021 17:04:11 +0100 Subject: [PATCH 20/52] Set explicit Java compiler source/target levels to 1.7 --- qdox.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qdox.spec b/qdox.spec index 6e0085f..d43b441 100644 --- a/qdox.spec +++ b/qdox.spec @@ -4,7 +4,7 @@ Name: qdox Version: 2.0.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Extract class/interface/method definitions from sources License: ASL 2.0 URL: https://github.com/paul-hammant/qdox @@ -72,7 +72,7 @@ jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexe ) # Build artifact -%mvn_build -f +%mvn_build -f -- -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7 # Inject OSGi manifests jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1} @@ -88,6 +88,9 @@ jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1} %license LICENSE.txt %changelog +* Tue Nov 02 2021 Mikolaj Izdebski - 2.0.0-7 +- Set explicit Java compiler source/target levels to 1.7 + * Fri Jul 23 2021 Fedora Release Engineering - 2.0.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 4c126210a2d3439ca868a4029e66e907ecd7b1c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 16:55:39 +0000 Subject: [PATCH 21/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qdox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qdox.spec b/qdox.spec index d43b441..188fdca 100644 --- a/qdox.spec +++ b/qdox.spec @@ -4,7 +4,7 @@ Name: qdox Version: 2.0.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Extract class/interface/method definitions from sources License: ASL 2.0 URL: https://github.com/paul-hammant/qdox @@ -88,6 +88,9 @@ jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1} %license LICENSE.txt %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 2.0.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Nov 02 2021 Mikolaj Izdebski - 2.0.0-7 - Set explicit Java compiler source/target levels to 1.7 From f300a5307d2c10b2d687309650f913c82b4e342e Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 23:58:14 +0100 Subject: [PATCH 22/52] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- qdox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qdox.spec b/qdox.spec index 188fdca..0de24d5 100644 --- a/qdox.spec +++ b/qdox.spec @@ -4,7 +4,7 @@ Name: qdox Version: 2.0.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Extract class/interface/method definitions from sources License: ASL 2.0 URL: https://github.com/paul-hammant/qdox @@ -88,6 +88,9 @@ jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1} %license LICENSE.txt %changelog +* Sat Feb 05 2022 Jiri Vanek - 2.0.0-9 +- Rebuilt for java-17-openjdk as system jdk + * Fri Jan 21 2022 Fedora Release Engineering - 2.0.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 0607b9332634c99bdef2e53e5035ae44303d170b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:24 +0200 Subject: [PATCH 23/52] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- qdox.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/qdox.spec b/qdox.spec index 0de24d5..e233cd2 100644 --- a/qdox.spec +++ b/qdox.spec @@ -9,6 +9,7 @@ Summary: Extract class/interface/method definitions from sources License: ASL 2.0 URL: https://github.com/paul-hammant/qdox BuildArch: noarch +ExclusiveArch: %{java_arches} noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz From 78693d737c268baad71f806cdf43ac866de32b81 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 08:03:17 +0200 Subject: [PATCH 24/52] Update build-requires in bootstrap mode --- qdox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qdox.spec b/qdox.spec index e233cd2..482a4b5 100644 --- a/qdox.spec +++ b/qdox.spec @@ -19,11 +19,11 @@ Source2: generate-tarball.sh Patch0: 0001-Port-to-JFlex-1.7.0.patch -BuildRequires: maven-local BuildRequires: byaccj %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else +BuildRequires: maven-local BuildRequires: jflex %endif From 0f709a974d1c157a995690e6eee2e1d4e96a55b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 23:53:39 +0000 Subject: [PATCH 25/52] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qdox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qdox.spec b/qdox.spec index 482a4b5..585d921 100644 --- a/qdox.spec +++ b/qdox.spec @@ -4,7 +4,7 @@ Name: qdox Version: 2.0.0 -Release: 9%{?dist} +Release: 10%{?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 22 2022 Fedora Release Engineering - 2.0.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Feb 05 2022 Jiri Vanek - 2.0.0-9 - Rebuilt for java-17-openjdk as system jdk From 513b9a0ff2ec209ca7dfe8c254a26d69cfbe5d9e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Aug 2022 08:36:51 +0200 Subject: [PATCH 26/52] 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 Date: Fri, 20 Jan 2023 18:51:50 +0000 Subject: [PATCH 27/52] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 2.0.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 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 Date: Fri, 21 Jul 2023 15:51:00 +0000 Subject: [PATCH 28/52] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 2.0.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jan 20 2023 Fedora Release Engineering - 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 Date: Thu, 17 Aug 2023 20:07:52 +0200 Subject: [PATCH 29/52] 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 -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 - 2.0.3-1 +- Update to upstream version 2.0.3 + * Fri Jul 21 2023 Fedora Release Engineering - 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 Date: Fri, 1 Sep 2023 13:20:36 +0200 Subject: [PATCH 30/52] 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 - 2.0.3-2 +- Convert License tag to SPDX format + * Thu Aug 17 2023 Mikolaj Izdebski - 2.0.3-1 - Update to upstream version 2.0.3 From 3b1b51d05b8980a3a5429d86450b1a9a6c3db0ad Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:08 +0200 Subject: [PATCH 31/52] 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 Date: Mon, 22 Jan 2024 09:29:20 +0000 Subject: [PATCH 32/52] 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 - 2.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Sep 01 2023 Mikolaj Izdebski - 2.0.3-2 - Convert License tag to SPDX format From dba1b48af240b18ffe372918caf4fbd50b77e870 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 13:48:06 +0000 Subject: [PATCH 33/52] 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 - 2.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 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 Date: Fri, 2 Feb 2024 19:59:41 +0100 Subject: [PATCH 34/52] 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 - 2.1.0-1 +- Update to upstream version 2.1.0 + * Fri Jan 26 2024 Fedora Release Engineering - 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 Date: Fri, 23 Feb 2024 14:40:34 +0100 Subject: [PATCH 35/52] 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 - 2.1.0-2 +- bump of release for for java-21-openjdk as system jdk + * Fri Feb 02 2024 Mikolaj Izdebski - 2.1.0-1 - Update to upstream version 2.1.0 From 4f13583c67e68a3d12306795a0922659130b6d2f Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 17:59:14 +0100 Subject: [PATCH 36/52] 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 - 2.1.0-3 +- Rebuilt for java-21-openjdk as system jdk + * Fri Feb 23 2024 Jiri Vanek - 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 Date: Thu, 4 Jul 2024 11:35:01 +0200 Subject: [PATCH 37/52] 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 - 2.1.0-4 +- Enable upstream test suite + * Tue Feb 27 2024 Jiri Vanek - 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 Date: Fri, 19 Jul 2024 17:34:00 +0000 Subject: [PATCH 38/52] 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 - 2.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jul 04 2024 Mikolaj Izdebski - 2.1.0-4 - Enable upstream test suite From 00111841f88d188b21f54efe3970fc8dae8ccc07 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:30 +0200 Subject: [PATCH 39/52] 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 Date: Tue, 20 Aug 2024 16:33:57 +0200 Subject: [PATCH 40/52] 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 Date: Thu, 22 Aug 2024 22:13:19 +0200 Subject: [PATCH 41/52] 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 Date: Fri, 23 Aug 2024 00:45:19 +0200 Subject: [PATCH 42/52] 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 - 2.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jul 04 2024 Mikolaj Izdebski - 2.1.0-4 +- Enable upstream test suite + +* Tue Feb 27 2024 Jiri Vanek - 2.1.0-3 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 2.1.0-2 +- bump of release for for java-21-openjdk as system jdk + +* Fri Feb 02 2024 Mikolaj Izdebski - 2.1.0-1 +- Update to upstream version 2.1.0 + +* Fri Jan 26 2024 Fedora Release Engineering - 2.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 2.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 2.0.3-2 +- Convert License tag to SPDX format + +* Thu Aug 17 2023 Mikolaj Izdebski - 2.0.3-1 +- Update to upstream version 2.0.3 + +* Fri Jul 21 2023 Fedora Release Engineering - 2.0.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 2.0.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 2.0.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 2.0.0-9 +- Rebuilt for java-17-openjdk as system jdk + +* Fri Jan 21 2022 Fedora Release Engineering - 2.0.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Mikolaj Izdebski - 2.0.0-7 +- Set explicit Java compiler source/target levels to 1.7 + +* Fri Jul 23 2021 Fedora Release Engineering - 2.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 2.0.0-5 +- Bootstrap build +- Non-bootstrap build + +* Wed Jan 27 2021 Fedora Release Engineering - 0:2.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0:2.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 0:2.0.0-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Feb 26 2020 Marian Koncek - 2.0.0-1 +- Update to upstream version 2.0.0 + +* Thu Feb 13 2020 Fabio Valentini - 0:2.0.0-1 +- Update to version 2.0.0. + +* Thu Jan 30 2020 Fedora Release Engineering - 0:2.0-8.M9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Nov 22 2019 Fabio Valentini - 0:2.0-7.M9 +- Remove unnecessary dependency on parent POM. + +* Tue Nov 05 2019 Mikolaj Izdebski - 2.0~M10-2 +- Mass rebuild for javapackages-tools 201902 + +* Wed Sep 18 2019 Marian Koncek - 2.0~M10-1 +- Update to upstream version 2.0~M10 + +* Sun Aug 18 2019 Fabio Valentini - 0:2.0-6.M9 +- Port to jflex 1.7.0. + +* Fri Jul 26 2019 Fedora Release Engineering - 0:2.0-5.M9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Jun 07 2019 Mikolaj Izdebski - 2.0-5.M9 +- Port to JFlex 1.7.0 + +* Fri May 24 2019 Mikolaj Izdebski - 2.0-4.M9 +- Mass rebuild for javapackages-tools 201901 + +* Sat Feb 02 2019 Fedora Release Engineering - 0:2.0-4.M9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jul 31 2018 Michael Simacek - 0:2.0-3.M9 +- Repack tarball to remove possibly proprietary binaries + +* Sat Jul 14 2018 Fedora Release Engineering - 0:2.0-2.M9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 05 2018 Michael Simacek - 0:2.0-1.M9 +- Update to upstream version 2.0-M9 + +* Fri Feb 09 2018 Fedora Release Engineering - 0:2.0-0.12.M7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Sep 25 2017 Mikolaj Izdebski - 0:2.0-0.11.M7 +- Elimitate race condition when injecting JAR manifest +- Resolves: rhbz#1495243 + +* Tue Sep 12 2017 Mikolaj Izdebski - 0:2.0-0.10.M7 +- Update to upstream version 2.0-M7 + +* Thu Jul 27 2017 Fedora Release Engineering - 0:2.0-0.9.M5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 0:2.0-0.8.M5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Jan 20 2017 Michael Simacek - 0:2.0-0.7.M5 +- Backport patch for misparsed comments + +* Tue Jan 17 2017 Michael Simacek - 0:2.0-0.6.M5 +- Update to upstream version 2.0-M5 + +* Thu Feb 04 2016 Fedora Release Engineering - 0:2.0-0.5.M3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Jun 22 2015 Mikolaj Izdebski - 0:2.0-0.4.M3 +- Update to upstream version 2.0-M3 + +* Thu Jun 18 2015 Fedora Release Engineering - 0:2.0-0.3.M2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Mar 24 2015 Mikolaj Izdebski - 0:2.0-0.2.M2 +- Regenerate build-requires +- Remove obsoletes on qdox-manual + +* Mon Oct 27 2014 Mikolaj Izdebski - 0:2.0-1.M2 +- Update to upstream version 2.0-M2 + +* Sun Jun 08 2014 Fedora Release Engineering - 0:1.12.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 29 2014 Mikolaj Izdebski - 0:1.12.1-9 +- Build with %%mvn_build + +* Tue Mar 04 2014 Stanislav Ochotnicky - 0:1.12.1-8 +- Use Requires: java-headless rebuild (#1067528) + +* Mon Aug 12 2013 akurtakov 0:1.12.1-7 +- Fix FTBFS bug#993187 . + +* Sun Aug 04 2013 Fedora Release Engineering - 0:1.12.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sat Feb 23 2013 Alexander Kurtakov 0:1.12.1-5 +- Remove wagon-webdav extension. + +* Thu Feb 14 2013 Fedora Release Engineering - 0:1.12.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 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 - 0:1.12.1-2 +- Run jflex manually before Maven build is started +- Resolves: rhbz#879653 + +* Tue Dec 11 2012 Alexander Kurtakov 0:1.12.1-1 +- Update to latest upstream release. + +* Tue Nov 13 2012 Stanislav Ochotnicky - 0:1.12-7 +- Add license to javadoc subpackage + +* Wed Aug 1 2012 Alexander Kurtakov 0:1.12-6 +- Inject osgi metadata from eclipse orbit. + +* Sat Jul 21 2012 Fedora Release Engineering - 0:1.12-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0:1.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Jun 10 2011 Alexander Kurtakov 0:1.12-3 +- Build with maven 3.x. +- Adapt to current guidelines. + +* Tue Feb 08 2011 Fedora Release Engineering - 0:1.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Oct 5 2010 Alexander Kurtakov 0:1.12-1 +- Update to new version. + +* Mon Jun 7 2010 Alexander Kurtakov 0:1.11-3 +- Make sure to remove all yacc executables. + +* Mon Jun 7 2010 Alexander Kurtakov 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 0:1.11-1 +- Update to 1.11. + +* Mon Feb 15 2010 Alexander Kurtakov 0:1.10.1-2 +- Rebuild for rhbz#565013. + +* Thu Jan 14 2010 Alexander Kurtakov 0:1.10.1-1 +- Update to upstream 1.10.1. + +* Sat Sep 19 2009 Alexander Kurtakov 0:1.9.2-2 +- Remove not needed sources. + +* Tue Aug 18 2009 Alexander Kurtakov 0:1.9.2-1 +- Update to 1.9.2. + +* Fri Apr 03 2009 Ralph Apel 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 0:1.6.3-5.jpp5 +- Restore to devel +- Drop mockobjects BR + +* Fri Jun 13 2008 Ralph Apel 0:1.6.3-4.jpp5 +- Add com.thoughtworks.qdox groupId to depmap frag + +* Tue Feb 26 2008 Ralph Apel 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 0:1.6.3-2jpp +- Fix maven macro value + +* Thu Nov 22 2007 Ralph Apel 0:1.6.3-1jpp +- Upgrade to 1.6.3 + +* Wed May 30 2007 Ralph Apel 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 0:1.6.1-1jpp.ep1.4 +- Rebuild with fixed component-info.xml + +* Fri Feb 23 2007 Ralph Apel 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 - 0:1.5-2jpp +- Rebuild for JPP-1.7, adapting to maven-1.1 + +* Wed Nov 16 2005 Ralph Apel - 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 - 0:1.4-3jpp +- Rebuild with Ant 1.6.2 + +* Fri Aug 06 2004 Ralph Apel - 0:1.4-2jpp +- Upgrade to ant-1.6.X + +* Mon Jun 07 2004 Ralph Apel - 0:1.4-1jpp +- Upgrade to 1.4 +- Drop Requires: mockobjects (Build/Test only) + +* Tue Feb 24 2004 Ralph Apel - 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 - 2.1.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jul 04 2024 Mikolaj Izdebski - 2.1.0-4 -- Enable upstream test suite - -* Tue Feb 27 2024 Jiri Vanek - 2.1.0-3 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 2.1.0-2 -- bump of release for for java-21-openjdk as system jdk - -* Fri Feb 02 2024 Mikolaj Izdebski - 2.1.0-1 -- Update to upstream version 2.1.0 - -* Fri Jan 26 2024 Fedora Release Engineering - 2.0.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 2.0.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Sep 01 2023 Mikolaj Izdebski - 2.0.3-2 -- Convert License tag to SPDX format - -* Thu Aug 17 2023 Mikolaj Izdebski - 2.0.3-1 -- Update to upstream version 2.0.3 - -* Fri Jul 21 2023 Fedora Release Engineering - 2.0.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jan 20 2023 Fedora Release Engineering - 2.0.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 2.0.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Feb 05 2022 Jiri Vanek - 2.0.0-9 -- Rebuilt for java-17-openjdk as system jdk - -* Fri Jan 21 2022 Fedora Release Engineering - 2.0.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Nov 02 2021 Mikolaj Izdebski - 2.0.0-7 -- Set explicit Java compiler source/target levels to 1.7 - -* Fri Jul 23 2021 Fedora Release Engineering - 2.0.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 2.0.0-5 -- Bootstrap build -- Non-bootstrap build - -* Wed Jan 27 2021 Fedora Release Engineering - 0:2.0.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0:2.0.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jul 11 2020 Jiri Vanek - 0:2.0.0-2 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Wed Feb 26 2020 Marian Koncek - 2.0.0-1 -- Update to upstream version 2.0.0 - -* Thu Feb 13 2020 Fabio Valentini - 0:2.0.0-1 -- Update to version 2.0.0. - -* Thu Jan 30 2020 Fedora Release Engineering - 0:2.0-8.M9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Nov 22 2019 Fabio Valentini - 0:2.0-7.M9 -- Remove unnecessary dependency on parent POM. - -* Tue Nov 05 2019 Mikolaj Izdebski - 2.0~M10-2 -- Mass rebuild for javapackages-tools 201902 - -* Wed Sep 18 2019 Marian Koncek - 2.0~M10-1 -- Update to upstream version 2.0~M10 - -* Sun Aug 18 2019 Fabio Valentini - 0:2.0-6.M9 -- Port to jflex 1.7.0. - -* Fri Jul 26 2019 Fedora Release Engineering - 0:2.0-5.M9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Jun 07 2019 Mikolaj Izdebski - 2.0-5.M9 -- Port to JFlex 1.7.0 - -* Fri May 24 2019 Mikolaj Izdebski - 2.0-4.M9 -- Mass rebuild for javapackages-tools 201901 - -* Sat Feb 02 2019 Fedora Release Engineering - 0:2.0-4.M9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jul 31 2018 Michael Simacek - 0:2.0-3.M9 -- Repack tarball to remove possibly proprietary binaries - -* Sat Jul 14 2018 Fedora Release Engineering - 0:2.0-2.M9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 05 2018 Michael Simacek - 0:2.0-1.M9 -- Update to upstream version 2.0-M9 - -* Fri Feb 09 2018 Fedora Release Engineering - 0:2.0-0.12.M7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Sep 25 2017 Mikolaj Izdebski - 0:2.0-0.11.M7 -- Elimitate race condition when injecting JAR manifest -- Resolves: rhbz#1495243 - -* Tue Sep 12 2017 Mikolaj Izdebski - 0:2.0-0.10.M7 -- Update to upstream version 2.0-M7 - -* Thu Jul 27 2017 Fedora Release Engineering - 0:2.0-0.9.M5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0:2.0-0.8.M5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jan 20 2017 Michael Simacek - 0:2.0-0.7.M5 -- Backport patch for misparsed comments - -* Tue Jan 17 2017 Michael Simacek - 0:2.0-0.6.M5 -- Update to upstream version 2.0-M5 - -* Thu Feb 04 2016 Fedora Release Engineering - 0:2.0-0.5.M3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Jun 22 2015 Mikolaj Izdebski - 0:2.0-0.4.M3 -- Update to upstream version 2.0-M3 - -* Thu Jun 18 2015 Fedora Release Engineering - 0:2.0-0.3.M2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Mar 24 2015 Mikolaj Izdebski - 0:2.0-0.2.M2 -- Regenerate build-requires -- Remove obsoletes on qdox-manual - -* Mon Oct 27 2014 Mikolaj Izdebski - 0:2.0-1.M2 -- Update to upstream version 2.0-M2 - -* Sun Jun 08 2014 Fedora Release Engineering - 0:1.12.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 29 2014 Mikolaj Izdebski - 0:1.12.1-9 -- Build with %%mvn_build - -* Tue Mar 04 2014 Stanislav Ochotnicky - 0:1.12.1-8 -- Use Requires: java-headless rebuild (#1067528) - -* Mon Aug 12 2013 akurtakov 0:1.12.1-7 -- Fix FTBFS bug#993187 . - -* Sun Aug 04 2013 Fedora Release Engineering - 0:1.12.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sat Feb 23 2013 Alexander Kurtakov 0:1.12.1-5 -- Remove wagon-webdav extension. - -* Thu Feb 14 2013 Fedora Release Engineering - 0:1.12.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 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 - 0:1.12.1-2 -- Run jflex manually before Maven build is started -- Resolves: rhbz#879653 - -* Tue Dec 11 2012 Alexander Kurtakov 0:1.12.1-1 -- Update to latest upstream release. - -* Tue Nov 13 2012 Stanislav Ochotnicky - 0:1.12-7 -- Add license to javadoc subpackage - -* Wed Aug 1 2012 Alexander Kurtakov 0:1.12-6 -- Inject osgi metadata from eclipse orbit. - -* Sat Jul 21 2012 Fedora Release Engineering - 0:1.12-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 0:1.12-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Jun 10 2011 Alexander Kurtakov 0:1.12-3 -- Build with maven 3.x. -- Adapt to current guidelines. - -* Tue Feb 08 2011 Fedora Release Engineering - 0:1.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Oct 5 2010 Alexander Kurtakov 0:1.12-1 -- Update to new version. - -* Mon Jun 7 2010 Alexander Kurtakov 0:1.11-3 -- Make sure to remove all yacc executables. - -* Mon Jun 7 2010 Alexander Kurtakov 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 0:1.11-1 -- Update to 1.11. - -* Mon Feb 15 2010 Alexander Kurtakov 0:1.10.1-2 -- Rebuild for rhbz#565013. - -* Thu Jan 14 2010 Alexander Kurtakov 0:1.10.1-1 -- Update to upstream 1.10.1. - -* Sat Sep 19 2009 Alexander Kurtakov 0:1.9.2-2 -- Remove not needed sources. - -* Tue Aug 18 2009 Alexander Kurtakov 0:1.9.2-1 -- Update to 1.9.2. - -* Fri Apr 03 2009 Ralph Apel 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 0:1.6.3-5.jpp5 -- Restore to devel -- Drop mockobjects BR - -* Fri Jun 13 2008 Ralph Apel 0:1.6.3-4.jpp5 -- Add com.thoughtworks.qdox groupId to depmap frag - -* Tue Feb 26 2008 Ralph Apel 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 0:1.6.3-2jpp -- Fix maven macro value - -* Thu Nov 22 2007 Ralph Apel 0:1.6.3-1jpp -- Upgrade to 1.6.3 - -* Wed May 30 2007 Ralph Apel 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 0:1.6.1-1jpp.ep1.4 -- Rebuild with fixed component-info.xml - -* Fri Feb 23 2007 Ralph Apel 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 - 0:1.5-2jpp -- Rebuild for JPP-1.7, adapting to maven-1.1 - -* Wed Nov 16 2005 Ralph Apel - 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 - 0:1.4-3jpp -- Rebuild with Ant 1.6.2 - -* Fri Aug 06 2004 Ralph Apel - 0:1.4-2jpp -- Upgrade to ant-1.6.X - -* Mon Jun 07 2004 Ralph Apel - 0:1.4-1jpp -- Upgrade to 1.4 -- Drop Requires: mockobjects (Build/Test only) - -* Tue Feb 24 2004 Ralph Apel - 0:1.3-1jpp -- First JPackage release +%autochangelog From 25b5a49f109ed46b97296f1b069f4025127f7b98 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:39 +0100 Subject: [PATCH 43/52] 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 Date: Tue, 31 Dec 2024 09:59:11 +0100 Subject: [PATCH 44/52] 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 Date: Sat, 18 Jan 2025 21:17:29 +0000 Subject: [PATCH 45/52] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From c0951aeae229af107797fc381379662bab0f3443 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 19 Feb 2025 08:01:48 +0100 Subject: [PATCH 46/52] 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 Date: Mon, 3 Mar 2025 11:57:14 +0100 Subject: [PATCH 47/52] 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 Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 48/52] 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 Date: Thu, 22 May 2025 13:35:32 +0200 Subject: [PATCH 49/52] 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 Date: Sun, 13 Jul 2025 09:22:52 +0200 Subject: [PATCH 50/52] 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 Date: Fri, 25 Jul 2025 11:23:37 +0000 Subject: [PATCH 51/52] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 729d1479ae527ab3838a38989e3ab332b3e8f7d5 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 01:11:51 +0200 Subject: [PATCH 52/52] 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.