From 38b58e03cb085bc0b1ae40f438d3e9b7d4f2e58b8e3141392988390444876b18 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 22 Nov 2023 05:52:59 +0000 Subject: [PATCH] Accepting request 1128007 from home:urbic:branches:Java:packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update to version 7.0.13 * Modifications in JavaCC 7.0.13 + #267 : Resolve merge conflicts from #245 + #245 : Fix issue #243 (Character code is returned instead of the symbol in the message) + #232 : Revert “Try to fix }}} issue in GitHub Pages” + #231 : Try to fix }}} issue in GitHub Pages * Modifications in JavaCC 7.0.12 + #230 : Remove unused char from TokenMgrError.template in LexicalEr + #228 : Remove redundant cast in TokenMgrError template + #224 : Production part in javacc_input cannot be omitted + #223 : Fix annotations for JavaCharStream + #222 : Generate max. one deprecated annotation per method + #219 : Fix mismatched javadoc + #213 : Fix legacy links to Apache Lucene’s grammar file + #212 : Test for allocation expression #189 + #211 : Bad defaultVisit() method generated + #210 : Another change for marked for removal + #209 : Improve lexical error message + #208 : Relocated misplaced annotations + #207 : Changed methods marked for removal + #206 : Build xml improvements + #205 : Small fixes on warnings + #203 : Missing change for doc for token_manager_decls (issue #190) + #202 : Fix doc for token_manager_decls (issue #190) + #200 : Update index.md and _config.yml + #199 : Fix QueryParser.jj url in README - Remove patches: * 0001-Generate-max.-one-deprecated-annotation-per-method.patch * 0002-Fix-annotations-for-JavaCharStream.patch + not needed any more in this version (already applied by upstream) - Added patches: * 0001-Generate-max.-one-deprecated-annotation-per-method.patch * 0002-Fix-annotations-for-JavaCharStream.patch + Fix regression where duplicate @Deprecated annotations were generated - Update to version 7.0.11 * Modifications in version 7.0.11 + #193 : Code error in class RCharacterList.SortDescriptors(): fixed * Modifications in version 7.0.10 + #183 : Lookahead is broken since 7.0.5 (introduced in commit fbac68f) * Modifications in version 7.0.9 + pom.xml : change deployment on OSS to automatic release + documentation : fix broken links * Modifications in version 7.0.8 + #175 : Doesn’t work in Turkish Locale + #73 : javacc/c++: invalid lookahead processing: missing one lookahead to get rid of the conflict * Modifications in version 7.0.7 + JavaCC.jj : remove unused c++ declaration blocs tokens + #172 : add a specific ‘-version’ command line argument * Modifications in version 7.0.6 The following changes are not upward compatible with the previous 7.0.5 version but have a very little impact on existing grammars. Main advantage is to prepare a more smooth upgrade with the upcoming javacc-8.0.0 major release. + C++ generation: renaming the option TOKEN_EXTENDS by TOKEN_SUPER_CLASS + C++ generation: renaming the option TOKEN_INCLUDES by TOKEN_INCLUDE + C++ generation: renaming the option PARSER_INCLUDES by PARSER_INCLUDE + C++ generation: renaming the option TOKEN_MANAGER_INCLUDES by TOKEN_MANAGER_INCLUDE * Modifications in version 7.0.5 + #42: new README.md file. + #71: Add support for Java7 language features. + #75: Allow empty type parameters in Java code of grammar files. + #77: javacc.org is out of date. + #92: Avoid warning of unused import in generated ParserTokenManager. + #99: LookaheadSuccess creation performance improved. Removing IDE specific files. Declare trace_indent only if debug parser is enabled. CPPParser.jj grammar added to grammars. Build with Maven is working again. —WARNING—WARNING—WARNING— Required Java Platform: Standard Edition 7.0: known under Eclipse as JavaSE-1.7 - Build with source/target levels 8 - Make this a multibuild package where the bootstrap version is built using the included javacc.jar and the non-bootstrap version uses the system javacc.jar - Upgrade to 7.0.4 * No obvious changelog * Fixes a number of C++ generation issues - Generate the scripts during build using jpackage_script - Build and package the javadoc documentation - Removed patch: * javacc.patch + not needed any more in this version - Fix build with jdk9: specify java source and target 1.6 - Do not use gcj as it is getting deprecated - Version bump to 5.0: * No obvious changelog * Works better with jdk8 - Updated to match up with fedora version - Build with gcc-java as openjdk7 (1.7.0_40) fails to build it - Move from jpackage-utils to javapackage-tools - updated to 4.0: See the bug list in issue tracker for all the bugs fixed in this release. JJTree and JavaCC both now support 1.5 syntax. We now support accessing token fields in the grammar like: s=.image Convenient constructors for passing encoding directly to the grammar Tabsetting is now customizable. SimpleNode can now extend a class using the NODE_EXTENDS option. JAVACODE and BNF productions take optional access modifiers. - set source=1.4 for java - converted neededforbuild to BuildRequires - Current version 3.2 from JPackage.org - add norootforbuild - initial package OBS-URL: https://build.opensuse.org/request/show/1128007 OBS-URL: https://build.opensuse.org/package/show/Java:packages/javacc?expand=0&rev=31 --- ...one-deprecated-annotation-per-method.patch | 50 ---- 0002-Fix-annotations-for-JavaCharStream.patch | 281 ------------------ javacc-7.0.11.tar.gz | 3 - javacc-7.0.13.tar.gz | 3 + javacc.changes | 74 +++-- javacc.spec | 8 +- 6 files changed, 61 insertions(+), 358 deletions(-) delete mode 100644 0001-Generate-max.-one-deprecated-annotation-per-method.patch delete mode 100644 0002-Fix-annotations-for-JavaCharStream.patch delete mode 100644 javacc-7.0.11.tar.gz create mode 100644 javacc-7.0.13.tar.gz diff --git a/0001-Generate-max.-one-deprecated-annotation-per-method.patch b/0001-Generate-max.-one-deprecated-annotation-per-method.patch deleted file mode 100644 index 08deca3..0000000 --- a/0001-Generate-max.-one-deprecated-annotation-per-method.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 4a9fc6a7992e8623956dee6c8cebd0b224968418 Mon Sep 17 00:00:00 2001 -From: Zbynek Konecny -Date: Wed, 20 Apr 2022 17:01:00 +0200 -Subject: [PATCH 1/2] Generate max. one deprecated annotation per method - ---- - .../resources/templates/gwt/SimpleCharStream.template | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/src/main/resources/templates/gwt/SimpleCharStream.template b/src/main/resources/templates/gwt/SimpleCharStream.template -index 9c88437..a1de1e3 100644 ---- a/src/main/resources/templates/gwt/SimpleCharStream.template -+++ b/src/main/resources/templates/gwt/SimpleCharStream.template -@@ -215,14 +215,13 @@ ${SUPPORT_CLASS_VISIBILITY_PUBLIC?public :}class SimpleCharStream - return c; - } - --#if GENERATE_ANNOTATIONS -- @Deprecated --#fi - /** - * @deprecated - * @see #getEndColumn - */ -+#if GENERATE_ANNOTATIONS - @Deprecated -+#fi - ${PREFIX}public int getColumn() { - #if KEEP_LINE_COLUMN - return bufcolumn[bufpos]; -@@ -231,14 +230,13 @@ ${SUPPORT_CLASS_VISIBILITY_PUBLIC?public :}class SimpleCharStream - #fi - } - --#if GENERATE_ANNOTATIONS -- @Deprecated --#fi - /** - * @deprecated - * @see #getEndLine - */ -+#if GENERATE_ANNOTATIONS - @Deprecated -+#fi - ${PREFIX}public int getLine() { - #if KEEP_LINE_COLUMN - return bufline[bufpos]; --- -2.36.0 - diff --git a/0002-Fix-annotations-for-JavaCharStream.patch b/0002-Fix-annotations-for-JavaCharStream.patch deleted file mode 100644 index efad64a..0000000 --- a/0002-Fix-annotations-for-JavaCharStream.patch +++ /dev/null @@ -1,281 +0,0 @@ -From 1e076c05b3739f12fc40e3b652183d770bfcc305 Mon Sep 17 00:00:00 2001 -From: Zbynek Konecny -Date: Mon, 25 Apr 2022 19:17:30 +0200 -Subject: [PATCH 2/2] Fix annotations for JavaCharStream - ---- - pom.xml | 21 ++++- - .../templates/gwt/JavaCharStream.template | 12 ++- - test/gwtTemplate/Parser.jj | 76 +++++++++++++++++++ - test/gwtUnicodeTemplate/Parser.jj | 76 +++++++++++++++++++ - 4 files changed, 175 insertions(+), 10 deletions(-) - create mode 100644 test/gwtTemplate/Parser.jj - create mode 100644 test/gwtUnicodeTemplate/Parser.jj - -diff --git a/pom.xml b/pom.xml -index 1f0b371..aedaed9 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -310,7 +310,7 @@ - - - -- - - -@@ -647,7 +662,7 @@ - - - --