From c373b43713804cdde3423967ae0d8f25653af457a675cc66f7c0cfdb504b4d7e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 12 Jan 2022 11:00:50 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/qdox?expand=0&rev=36 --- qdox-2.0.0-project.tar.bz2 | 3 --- qdox-2.0.1-project.tar.bz2 | 3 +++ qdox.spec | 13 ++++--------- 3 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 qdox-2.0.0-project.tar.bz2 create mode 100644 qdox-2.0.1-project.tar.bz2 diff --git a/qdox-2.0.0-project.tar.bz2 b/qdox-2.0.0-project.tar.bz2 deleted file mode 100644 index 0aa001f..0000000 --- a/qdox-2.0.0-project.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57148d2984cf47473365c86d5affe77a38b11f9982cc24456f9dd98cda820bf6 -size 457511 diff --git a/qdox-2.0.1-project.tar.bz2 b/qdox-2.0.1-project.tar.bz2 new file mode 100644 index 0000000..48225a3 --- /dev/null +++ b/qdox-2.0.1-project.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7656659c8ff8b4e3f6c9b5fd0164bfe2ff7211ccedaa21046e53e63005a6d37b +size 459971 diff --git a/qdox.spec b/qdox.spec index 1e24886..b284180 100644 --- a/qdox.spec +++ b/qdox.spec @@ -1,7 +1,7 @@ # # spec file for package qdox # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 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.0 +Version: 2.0.1 Release: 0 Summary: Tool to extract class/interface/method definitions from sources License: Apache-2.0 @@ -55,7 +55,6 @@ sed -i "s|\r||" README.md # We don't need these plugins %pom_remove_plugin :animal-sniffer-maven-plugin %pom_remove_plugin :maven-failsafe-plugin -%pom_remove_plugin :maven-jflex-plugin %pom_remove_plugin :maven-enforcer-plugin %pom_xpath_set pom:workingDirectory '${basedir}/src/main/java/com/thoughtworks/qdox/parser/impl' @@ -63,12 +62,8 @@ sed -i "s|\r||" README.md %pom_remove_parent . %build -# Generate scanners (upstream does this with maven-jflex-plugin) -# Add the --inputstreamctor option if jflex is upgraded to a version 1.6 or higher -CLASSPATH=$(build-classpath java-cup) \ - jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/lexer.flex -CLASSPATH=$(build-classpath java-cup) \ - jflex -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 # Generate the parsers using the command-line that the exec-maven-plugin uses GRAMMAR_PATH=$(pwd)/src/grammar/commentparser.y && \ From 37b32e4cb7637667318703bf880b50d70748294d2ba1329b05f246b2d753e8a1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 12 Jan 2022 12:16:00 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/qdox?expand=0&rev=37 --- 0001-Port-to-JFlex-1.7.0.patch | 39 ++++++++++++++++++++++++++++++++++ qdox-2.0.0-project.tar.bz2 | 3 +++ qdox-2.0.1-project.tar.bz2 | 3 --- qdox.spec | 22 +++++++++---------- 4 files changed, 52 insertions(+), 15 deletions(-) create mode 100644 0001-Port-to-JFlex-1.7.0.patch create mode 100644 qdox-2.0.0-project.tar.bz2 delete mode 100644 qdox-2.0.1-project.tar.bz2 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..f0f1a56 --- /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-2.0.0-project.tar.bz2 b/qdox-2.0.0-project.tar.bz2 new file mode 100644 index 0000000..0aa001f --- /dev/null +++ b/qdox-2.0.0-project.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57148d2984cf47473365c86d5affe77a38b11f9982cc24456f9dd98cda820bf6 +size 457511 diff --git a/qdox-2.0.1-project.tar.bz2 b/qdox-2.0.1-project.tar.bz2 deleted file mode 100644 index 48225a3..0000000 --- a/qdox-2.0.1-project.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7656659c8ff8b4e3f6c9b5fd0164bfe2ff7211ccedaa21046e53e63005a6d37b -size 459971 diff --git a/qdox.spec b/qdox.spec index b284180..a918dfc 100644 --- a/qdox.spec +++ b/qdox.spec @@ -17,7 +17,7 @@ Name: qdox -Version: 2.0.1 +Version: 2.0.0 Release: 0 Summary: Tool to extract class/interface/method definitions from sources License: Apache-2.0 @@ -25,6 +25,7 @@ Group: Development/Libraries/Java URL: https://github.com/paul-hammant/qdox Source0: https://repo1.maven.org/maven2/com/thoughtworks/qdox/qdox/%{version}/%{name}-%{version}-project.tar.bz2 Source1: qdox-MANIFEST.MF +Patch0: 0001-Port-to-JFlex-1.7.0.patch BuildRequires: byaccj BuildRequires: fdupes BuildRequires: java-cup-bootstrap @@ -47,6 +48,7 @@ API docs for %{name}. %prep %setup -q +%patch0 -p1 find -name *.jar -delete find -name *.class -delete rm -rf bootstrap @@ -55,6 +57,7 @@ sed -i "s|\r||" README.md # We don't need these plugins %pom_remove_plugin :animal-sniffer-maven-plugin %pom_remove_plugin :maven-failsafe-plugin +%pom_remove_plugin :maven-jflex-plugin %pom_remove_plugin :maven-enforcer-plugin %pom_xpath_set pom:workingDirectory '${basedir}/src/main/java/com/thoughtworks/qdox/parser/impl' @@ -62,20 +65,15 @@ sed -i "s|\r||" README.md %pom_remove_parent . %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 the parsers using the command-line that the exec-maven-plugin uses -GRAMMAR_PATH=$(pwd)/src/grammar/commentparser.y && \ - (cd src/main/java/com/thoughtworks/qdox/parser/impl && \ - byaccj -v -Jnorun -Jnoconstruct -Jclass=DefaultJavaCommentParser \ - -Jpackage=com.thoughtworks.qdox.parser.impl ${GRAMMAR_PATH}) -GRAMMAR_PATH=$(pwd)/src/grammar/parser.y && \ - (cd src/main/java/com/thoughtworks/qdox/parser/impl && \ - byaccj -v -Jnorun -Jnoconstruct -Jclass=Parser \ - -Jimplements=CommentHandler -Jsemantic=Value \ - -Jpackage=com.thoughtworks.qdox.parser.impl \ - -Jstack=500 ${GRAMMAR_PATH}) +# 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 mkdir -p build/classes From 1bbc702e3b61be1998c496f131a33b0fc7b237da4332fc320ae9fd35dd05807f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 13 Jan 2022 11:49:56 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/qdox?expand=0&rev=38 --- 0001-Port-to-JFlex-1.7.0.patch | 39 ------------ qdox-2.0.0-project.tar.bz2 | 3 - qdox-2.0.1-project.tar.bz2 | 3 + qdox-MANIFEST.MF | 19 ------ qdox-build.xml | 110 +++++++++++++++++++++++++++++++++ qdox.changes | 20 ++++++ qdox.spec | 33 ++++------ 7 files changed, 144 insertions(+), 83 deletions(-) delete mode 100644 0001-Port-to-JFlex-1.7.0.patch delete mode 100644 qdox-2.0.0-project.tar.bz2 create mode 100644 qdox-2.0.1-project.tar.bz2 delete mode 100644 qdox-MANIFEST.MF create mode 100644 qdox-build.xml 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 f0f1a56..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-2.0.0-project.tar.bz2 b/qdox-2.0.0-project.tar.bz2 deleted file mode 100644 index 0aa001f..0000000 --- a/qdox-2.0.0-project.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57148d2984cf47473365c86d5affe77a38b11f9982cc24456f9dd98cda820bf6 -size 457511 diff --git a/qdox-2.0.1-project.tar.bz2 b/qdox-2.0.1-project.tar.bz2 new file mode 100644 index 0000000..48225a3 --- /dev/null +++ b/qdox-2.0.1-project.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7656659c8ff8b4e3f6c9b5fd0164bfe2ff7211ccedaa21046e53e63005a6d37b +size 459971 diff --git a/qdox-MANIFEST.MF b/qdox-MANIFEST.MF deleted file mode 100644 index f2aea34..0000000 --- a/qdox-MANIFEST.MF +++ /dev/null @@ -1,19 +0,0 @@ -Manifest-Version: 1.0 -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.4 -Bundle-Name: %pluginName -Bundle-SymbolicName: com.thoughtworks.qdox -Bundle-Version: 1.6.3.v20081201-1400 -Export-Package: com.thoughtworks.qdox;version="1.6.3",com.thoughtworks - .qdox.ant;version="1.6.3",com.thoughtworks.qdox.directorywalker;versi - on="1.6.3",com.thoughtworks.qdox.junit;version="1.6.3",com.thoughtwor - ks.qdox.model;version="1.6.3",com.thoughtworks.qdox.model.util;versio - n="1.6.3",com.thoughtworks.qdox.parser;version="1.6.3",com.thoughtwor - ks.qdox.parser.impl;version="1.6.3",com.thoughtworks.qdox.parser.stru - cts;version="1.6.3",com.thoughtworks.qdox.tools;version="1.6.3" -Bundle-ManifestVersion: 2 -Import-Package: junit.framework;version="[3.8.2,4.0.0)";resolution:=op - tional,org.apache.tools.ant;version="[1.7.0,2.0.0)";resolution:=optio - nal,org.apache.tools.ant.types;version="[1.7.0,2.0.0)";resolution:=op - tional diff --git a/qdox-build.xml b/qdox-build.xml new file mode 100644 index 0000000..c2fe58c --- /dev/null +++ b/qdox-build.xml @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qdox.changes b/qdox.changes index 771313a..1513bc7 100644 --- a/qdox.changes +++ b/qdox.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Thu Jan 13 11:45:28 UTC 2022 - Fridrich Strba + +- Update to version 2.0.1: + * Changes: + + Support Lambda Expression + + Add SEALED / NON_SEALED tokens + + #75 CodeBlock for Annotation with FieldReference should prefix + field with canonical name + + Add UnqualifiedClassInstanceCreationExpression + + updating jflex-maven-plugin to 1.8.2 + + Add reference to grammar documentation and hints to transform + it + + Support Text Blocks + + Support Sealed Classes + + #67 Support records + + #76 test with an @@ in comment + + #64 Get interface via javaProjectBuilder.getClassByName +- Generate ant build file from maven pom and build using ant + ------------------------------------------------------------------- Thu Apr 29 23:11:06 UTC 2021 - Ferdinand Thiessen diff --git a/qdox.spec b/qdox.spec index a918dfc..9d17fe5 100644 --- a/qdox.spec +++ b/qdox.spec @@ -17,15 +17,15 @@ Name: qdox -Version: 2.0.0 +Version: 2.0.1 Release: 0 Summary: Tool to extract class/interface/method definitions from sources License: Apache-2.0 Group: Development/Libraries/Java URL: https://github.com/paul-hammant/qdox Source0: https://repo1.maven.org/maven2/com/thoughtworks/qdox/qdox/%{version}/%{name}-%{version}-project.tar.bz2 -Source1: qdox-MANIFEST.MF -Patch0: 0001-Port-to-JFlex-1.7.0.patch +Source1: qdox-build.xml +BuildRequires: ant BuildRequires: byaccj BuildRequires: fdupes BuildRequires: java-cup-bootstrap @@ -48,19 +48,18 @@ API docs for %{name}. %prep %setup -q -%patch0 -p1 +cp %{SOURCE1} build.xml find -name *.jar -delete find -name *.class -delete rm -rf bootstrap -# Fix line endings -sed -i "s|\r||" README.md # 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-jflex-plugin +%pom_remove_plugin :maven-invoker-plugin +%pom_remove_plugin :jflex-maven-plugin %pom_remove_plugin :maven-enforcer-plugin - -%pom_xpath_set pom:workingDirectory '${basedir}/src/main/java/com/thoughtworks/qdox/parser/impl' +%pom_remove_plugin :exec-maven-plugin %pom_remove_parent . @@ -75,29 +74,19 @@ 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 ) -# Build artifact -mkdir -p build/classes -javac -d build/classes -source 6 -target 6 \ - $(find src/main/java -name \*.java) -jar cf build/%{name}-%{version}.jar -C build/classes . - -# Inject OSGi manifests -jar ufm build/%{name}-%{version}.jar %{SOURCE1} - -mkdir -p build/apidoc -javadoc -d build/apidoc -source 6 -notimestamp $(find src/main/java -name \*.java) +%ant jar javadoc %install # jar install -dm 0755 %{buildroot}%{_javadir} -install -pm 0644 build/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +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 %add_maven_depmap %{name}.pom %{name}.jar -a qdox:qdox # javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -aL build/apidoc/* %{buildroot}%{_javadocdir}/%{name} +cp -aL target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles