commit b0ea9cfbe0de2cfe73fdfa1568525f7e9344b8d1801fe789dfe4cd7fe41ce1a2 Author: Adrian Schröter Date: Fri May 3 23:46:36 2024 +0200 Sync from SUSE:SLFO:Main qdox revision fadbc5b988476d17b4c8e6e8e8ba7a7b diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/Port-to-JFlex-1.7.0.patch b/Port-to-JFlex-1.7.0.patch new file mode 100644 index 0000000..e61983b --- /dev/null +++ b/Port-to-JFlex-1.7.0.patch @@ -0,0 +1,21 @@ ++++ qdox-2.0.1/src/grammar/lexer.flex 2022-03-12 07:00:33.182053962 +0100 +@@ -173,7 +173,7 @@ + } + + 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; + } + +--- qdox-2.0.1/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java 2021-11-13 15:25:20.000000000 +0100 ++++ qdox-2.0.1/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java 2022-03-12 07:00:33.182053962 +0100 +@@ -112,7 +112,7 @@ + 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 ); diff --git a/qdox-2.0.3-project.tar.bz2 b/qdox-2.0.3-project.tar.bz2 new file mode 100644 index 0000000..69ca8a9 --- /dev/null +++ b/qdox-2.0.3-project.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74ecec80836707d1132ade7c060d7136f5da387894c5fc8a91bd7805002535c0 +size 502433 diff --git a/qdox-build.xml b/qdox-build.xml new file mode 100644 index 0000000..47c95ae --- /dev/null +++ b/qdox-build.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qdox.changes b/qdox.changes new file mode 100644 index 0000000..e140c94 --- /dev/null +++ b/qdox.changes @@ -0,0 +1,140 @@ +------------------------------------------------------------------- +Thu Sep 21 05:55:13 UTC 2023 - Fridrich Strba + +- Build with java source/target levels 8 + +------------------------------------------------------------------- +Fri May 12 20:33:29 UTC 2023 - Fridrich Strba + +- Update to version 2.0.3: + * Changes: + + Update documentation #41 + + interface should be ignored as modifier #115 + + add byaccj 1.15 binaries for Mac OS on aarch64 (#109) + + Correctly resolve types with SourceFolderLibrary (#105) + + #99 Seems QDox 2.0.1 has issue parsing parameters names named + "recordList" and "record" + +------------------------------------------------------------------- +Sat Mar 12 06:06:28 UTC 2022 - Fridrich Strba + +- Add Automatic-Module-Name to the manifest +- Added patch: + * Port-to-JFlex-1.7.0.patch + + Don't use deprecated inputstreamctor option + +------------------------------------------------------------------- +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 + +- Update to version 2.0.0: + * No upstream changelog provided + +------------------------------------------------------------------- +Mon Apr 8 11:22:57 UTC 2019 - Fridrich Strba + +- Do not depend on the parent pom, since we are not building + using Maven. + +------------------------------------------------------------------- +Tue Jan 15 08:46:08 UTC 2019 - Fridrich Strba + +- BuildRequires: java-cup-bootstrap and jflex-bootstrap to avoid + build cycle (bsc#1121958) + +------------------------------------------------------------------- +Wed Jan 9 22:28:49 UTC 2019 - Jan Engelhardt + +- Use noun phrase in summary, and trim bias from descriptions. + +------------------------------------------------------------------- +Tue Jan 1 12:48:23 UTC 2019 - Fridrich Strba + +- Update to version 2.0-M9 + * Changed API to use Collections and Lists instead of Arrays + * No upstream changelog provided :/ + +------------------------------------------------------------------- +Mon Oct 29 10:51:58 UTC 2018 - Fridrich Strba + +- Install and package the maven artifact + +------------------------------------------------------------------- +Thu Apr 5 06:12:32 UTC 2018 - fstrba@suse.com + +- Build with java source and target version 6 in order to produce + bytecode understood by all supported java versions + +------------------------------------------------------------------- +Fri Jun 9 10:30:22 UTC 2017 - tchvatal@suse.com + +- Remove maven conditionals +- Drop javadoc to bootstrap + +------------------------------------------------------------------- +Thu Aug 28 08:39:19 UTC 2014 - coolo@suse.com + +- rename the conditional to junit_test and switch the default, + bootstrapping factory is more important than a single test + +------------------------------------------------------------------- +Tue Aug 12 08:44:32 UTC 2014 - lnussel@suse.de + +- introduce %with java_bootstrap to allow bootstrapping without junit + +------------------------------------------------------------------- +Thu May 15 13:11:04 UTC 2014 - darin@darins.net + +- Added xz build requirement for sles +- no bytecode check on sles + +------------------------------------------------------------------- +Mon Sep 9 11:06:17 UTC 2013 - tchvatal@suse.com + +- Move from jpackage-utils to javapackage-tools + +------------------------------------------------------------------- +Fri Nov 30 18:11:00 UTC 2012 - cobexer@gmail.com + +- update to 1.12.1 + * bugfix release, see + * http://jira.codehaus.org/browse/QDOX/fixforversion/18944 + +------------------------------------------------------------------- +Wed Nov 28 14:55:25 UTC 2012 - mvyskocil@suse.com + +- require saxon9 for build + +------------------------------------------------------------------- +Wed Oct 24 12:41:58 UTC 2012 - mvyskocil@suse.com + +- update to 1.12 + * needed for the fop 1.1 update + * mostly bugfix release, see + * http://qdox.codehaus.org/changes-report.html +- disabled tests as they tends to randomly fails + +------------------------------------------------------------------- +Tue May 5 14:21:19 CEST 2009 - mvyskocil@suse.cz + +- Initial build in SUSE. Version 1.6.1 from jpp 5.0 + diff --git a/qdox.spec b/qdox.spec new file mode 100644 index 0000000..a0e5ce2 --- /dev/null +++ b/qdox.spec @@ -0,0 +1,102 @@ +# +# spec file for package qdox +# +# Copyright (c) 2023 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: qdox +Version: 2.0.3 +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-build.xml +Patch0: Port-to-JFlex-1.7.0.patch +BuildRequires: ant +BuildRequires: byaccj +BuildRequires: fdupes +BuildRequires: java-cup-bootstrap +BuildRequires: java-devel +BuildRequires: javapackages-local +BuildRequires: jflex-bootstrap +BuildArch: noarch + +%description +QDox is a parser for extracting class/interface/method definitions +from source files complete with JavaDoc @tags. It is designed to be +used by active code generators or documentation tools. + +%package javadoc +Summary: Javadoc for %{name} +Group: Development/Libraries/Java + +%description javadoc +API docs for %{name}. + +%prep +%setup -q +cp %{SOURCE1} build.xml +%patch0 -p1 +find -name *.jar -delete +find -name *.class -delete +rm -rf bootstrap +# 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 :jflex-maven-plugin +%pom_remove_plugin :maven-enforcer-plugin +%pom_remove_plugin :exec-maven-plugin + +%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 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 +) + +%ant jar javadoc + +%install +# jar +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 +%add_maven_depmap %{name}.pom %{name}.jar -a qdox:qdox +# javadoc +mkdir -p %{buildroot}%{_javadocdir}/%{name} +cp -aL target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir} + +%files -f .mfiles +%license LICENSE.txt +%doc README.md + +%files javadoc +%{_javadocdir}/%{name} +%license LICENSE.txt + +%changelog