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.
2025-07-30 12:17:17 +02:00 · 2025-07-29 21:14:42 +02:00 · 2025-07-24 17:56:15 +00:00 · 2025-07-15 06:50:16 -06:00 · 2025-07-13 21:25:43 +02:00 · 2025-07-11 21:04:03 +02:00
16 changed files with 368 additions and 661 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -0,0 +1 @@
+1
--- a/.gitignore
+++ b/.gitignore
@ -7,3 +7,4 @@ javacc-5.0src.tar.gz
 /release_7_0_2.tar.gz
 /7.0.4.tar.gz
 /javacc-7.0.12.tar.gz
+/javacc-7.0.13.tar.gz
--- a/0002-Remove-extraneous-Deprecated-annotations.patch
+++ b/0002-Remove-extraneous-Deprecated-annotations.patch
@ -1,50 +0,0 @@
-From 64614546bd0c24469603241acd80dcb2c8035c8c Mon Sep 17 00:00:00 2001
-From: Jerry James <loganjerry@gmail.com>
-Date: Mon, 27 Mar 2023 15:34:48 -0600
-Subject: [PATCH] Remove extraneous @Deprecated annotations
-
---
- .../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.39.2
-
--- a/212
+++ b/212
@ -0,0 +1,212 @@
+* Tue Jul 30 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:7.0.13-7
+- Adjust bootstrap build for javapackages-bootstrap update
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.13-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 0:7.0.13-5
+- Rebuilt for java-21-openjdk as system jdk
+
+* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 0:7.0.13-4
+- bump of release for for java-21-openjdk as system jdk
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Nov 17 2023 Jerry James <loganjerry@gmail.com> - 0:7.0.13-1
+- Update to 7.0.13
+- Drop upstreamed duplicated @Deprecated annotations patch
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:7.0.12-4
+- Rebuild
+
+* Sat Aug 26 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:7.0.12-3
+- Bootstrap using javapackages-bootstrap
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Apr  1 2023 Jerry James <loganjerry@gmail.com> - 0:7.0.12-1
+- Update to 7.0.12
+- Convert License tag to SPDX
+- Add bootstrap build mode
+- Add patch to fix javadoc errors in the JavaCharStream template
+- Add patch to remove duplicate @Deprecated annotations
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.4-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.4-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 0:7.0.4-12
+- Rebuilt for Drop i686 JDKs
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 0:7.0.4-11
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.4-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.4-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.4-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.4-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 20 2020 Mat Booth <mat.booth@redhat.com> - 0:7.0.4-6
+- Force generation of 1.8 level bytecode to avoid breaking dependent packages
+  that require Java 8
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 0:7.0.4-5
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Oct 26 2018 Marian Koncek <mkoncek@redhat.com> - 0:7.0.4-1
+- Update to upstream version 7.0.4
+- Resolves: rhbz#1593262
+
+* Tue Jul 31 2018 Severin Gehwolf <sgehwolf@redhat.com> - 0:7.0.2-6
+- Add requirement on javapackages-tools for scripts using
+  java-functions.
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Jan 16 2017 Michael Simacek <msimacek@redhat.com> - 0:7.0.2-1
+- Update to upstream version 7.0.2
+
+* Mon Jan 02 2017 Michael Simacek <msimacek@redhat.com> - 0:7.0.1-1
+- Update to upstream version 7.0.1
+
+* Tue Sep 06 2016 Michael Simacek <msimacek@redhat.com> - 0:6.1.3-1
+- Update to upstream version 6.1.3
+- Use new upstream location
+- Generate scripts with jpackage_script
+
+* Tue Aug 23 2016 Michael Simacek <msimacek@redhat.com> - 0:6.1.2-1
+- Update to upstream version 6.1.2
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:5.0-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu May 29 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:5.0-11
+- Use .mfiles generated during build
+
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:5.0-10
+- Use Requires: java-headless rebuild (#1067528)
+
+* Tue Jul 30 2013 Michal Srb <msrb@redhat.com> - 0:5.0-9
+- Generate javadoc
+- Drop group tag
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Jun 28 2012 Jaromir Capik <jcapik@redhat.com> 0:5.0-6
+- Fixing #835786 - javacc: Invalid upstream URL
+- Minor spec file changes according to the latest guidelines
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Jul 13 2010 Alexander Kurtakov <akurtako@redhat.com> 0:5.0-3
+- Fix examples line endings.
+
+* Fri Jun 4 2010 Alexander Kurtakov <akurtako@redhat.com> 0:5.0-2
+- Apply changes requested in review bug (rhbz#225940).
+
+* Thu Feb 11 2010 Alexander Kurtakov <akurtako@redhat.com> 0:5.0-1
+- Update to upstream 5.0 release.
+
+* Tue Nov 24 2009 Alexander Kurtakov <akurtako@redhat.com> 0:4.1-0.6
+- Use standard permissions and fix unowned directories.
+
+* Tue Nov 24 2009 Alexander Kurtakov <akurtako@redhat.com> 0:4.1-0.5
+- Fix rpmlint warnings.
+- Drop gcj support.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:4.1-0.4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:4.1-0.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Dec 03 2008 Matt Wringe <mwringe@redhat.com> - 0:4.1-0.2
+- Update to remove packaged jars in source tar
+- Build with bootstrap jar so that required java source
+  files get generated
+
+* Wed Oct 22 2008 Jerry James <loganjerry@gmail.com> - 0:4.1-0.1
+- Update to 4.1
+- Also ship the jjrun script
+- Own the appropriate gcj directory
+- Minor spec file changes to comply with latest Fedora guidelines
+- Include the top-level index.html file in the manual
+
+* Wed Jul  9 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:4.0-4.5
+- drop repotag
+
+* Fri Feb 22 2008 Matt Wringe <mwringe at redhat.com> - 0:4.0-4jpp.4
+- Rename javacc script file to javacc.sh as this confuses the makefile
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0:4.0-4jpp.3
+- Autorebuild for GCC 4.3
+
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> - 0:4.0-3jpp.3
+- Rebuilt with new naming convention
+
+* Sat Jul 22 2006 Jakub Jelinek <jakub@redhat.com> - 0:4.0-3jpp_2fc
+- Rebuilt
+
+* Tue Jul 18 2006 Matthew Wringe <mwringe at redhat.com> - 0:4.0-3jpp_1fc
+- Merged with upstream version
+- Changed directory locations to rpm macros
+- Added conditional native compiling
+
+* Thu Apr 20 2006 Fernando Nasser <fnasser@redhat.com> - 0:4.0-2jpp
+- First JPP 1.7 build
+
+* Fri Mar 31 2006 Sebastiano Vigna <vigna at acm.org> - 0:4.0-1jpp
+- Updated to 4.0
+
+* Mon Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:3.2-2jpp
+- Rebuild with ant-1.6.2
+
+* Fri Jan 30 2004 Sebastiano Vigna <vigna at acm.org> 0:3.2-1jpp
+- First JPackage version
--- a/ci.fmf
+++ b/ci.fmf
@ -0,0 +1 @@
+resultsdb-testcase: separate
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,9 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_contexts:
+  - bodhi_update_push_testing
+  - bodhi_update_push_stable
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional}
--- a/javacc-javadoc.patch
+++ b/javacc-javadoc.patch
@ -1,94 +0,0 @@
--- javacc-javacc-7.0.12/src/main/java/org/javacc/parser/NonTerminal.java.orig	2022-12-23 03:58:07.000000000 -0700
-+++ javacc-javacc-7.0.12/src/main/java/org/javacc/parser/NonTerminal.java	2023-03-25 15:06:29.752641666 -0600
-@@ -94,28 +94,28 @@ public String getName() {
- }
- 
- /**
- * @param argument_tokens the argument_tokens to set
-+ * @param parametrized_type__tokens the parametrized type tokens to set
-  */
-public void setParametrizedTypeTokens(List<Token> argument_tokens) {
-	this.argument_tokens = argument_tokens;
-+public void setParametrizedTypeTokens(List<Token> parametrized_type__tokens) {
-+	this.parametrized_type__tokens = parametrized_type__tokens;
- }
- 
- /**
- * @return the argument_tokens
-+ * @return the parametrized type tokens
-  */
- public List<Token> getParametrizedTypeTokens() {
- 	return parametrized_type__tokens;
- }
- 
- /**
- * @param argument_tokens the argument_tokens to set
-+ * @param argument_tokens the argument tokens to set
-  */
-public void setArgumentTokens(List<Token> parametrized_type__tokens) {
-	this.parametrized_type__tokens = parametrized_type__tokens;
-+public void setArgumentTokens(List<Token> argument_tokens) {
-+	this.argument_tokens = argument_tokens;
- }
- 
- /**
- * @return the argument_tokens
-+ * @return the argument tokens
-  */
- public List<Token> getArgumentTokens() {
- 	return argument_tokens;
--- javacc-javacc-7.0.12/src/main/java/org/javacc/parser/ROneOrMore.java.orig	2022-12-23 03:58:07.000000000 -0700
-+++ javacc-javacc-7.0.12/src/main/java/org/javacc/parser/ROneOrMore.java	2023-03-25 14:54:33.946649796 -0600
-@@ -29,7 +29,7 @@
- package org.javacc.parser;
- 
- /**
- * Describes one-or-more regular expressions (<foo+>).
-+ * Describes one-or-more regular expressions (&lt;foo+&gt;).
-  */
- 
- public class ROneOrMore extends RegularExpression {
--- javacc-javacc-7.0.12/src/main/java/org/javacc/parser/RRepetitionRange.java.orig	2022-12-23 03:58:07.000000000 -0700
-+++ javacc-javacc-7.0.12/src/main/java/org/javacc/parser/RRepetitionRange.java	2023-03-25 14:55:02.786247660 -0600
-@@ -31,7 +31,7 @@ import java.util.ArrayList;
- import java.util.List;
- 
- /**
- * Describes one-or-more regular expressions (<foo+>).
-+ * Describes one-or-more regular expressions (&lt;foo+&gt;).
-  */
- 
- public class RRepetitionRange extends RegularExpression {
--- javacc-javacc-7.0.12/src/main/java/org/javacc/parser/RZeroOrMore.java.orig	2022-12-23 03:58:07.000000000 -0700
-+++ javacc-javacc-7.0.12/src/main/java/org/javacc/parser/RZeroOrMore.java	2023-03-25 14:55:21.049992983 -0600
-@@ -29,7 +29,7 @@
- package org.javacc.parser;
- 
- /**
- * Describes zero-or-more regular expressions (<foo*>).
-+ * Describes zero-or-more regular expressions (&lt;foo*&gt;).
-  */
- 
- public class RZeroOrMore extends RegularExpression {
--- javacc-javacc-7.0.12/src/main/java/org/javacc/parser/RZeroOrOne.java.orig	2022-12-23 03:58:07.000000000 -0700
-+++ javacc-javacc-7.0.12/src/main/java/org/javacc/parser/RZeroOrOne.java	2023-03-25 14:55:40.577720078 -0600
-@@ -28,7 +28,7 @@
- package org.javacc.parser;
- 
- /**
- * Describes zero-or-one regular expressions (<foo?>).
-+ * Describes zero-or-one regular expressions (&lt;foo?&gt;).
-  */
- 
- public class RZeroOrOne extends RegularExpression {
--- javacc-javacc-7.0.12/src/main/java/org/javacc/parser/TokenProduction.java.orig	2022-12-23 03:58:07.000000000 -0700
-+++ javacc-javacc-7.0.12/src/main/java/org/javacc/parser/TokenProduction.java	2023-03-25 15:06:51.760333891 -0600
-@@ -61,7 +61,7 @@ public class TokenProduction {
- 
-   /**
-    * The states in which this regular expression production exists.  If
-   * this array is null, then "<*>" has been specified and this regular
-+   * this array is null, then "&lt;*&gt;" has been specified and this regular
-    * expression exists in all states.  However, this null value is
-    * replaced by a String array that includes all lexical state names
-    * during the semanticization phase.
--- a/javacc-template-javadoc.patch
+++ b/javacc-template-javadoc.patch
@ -1,306 +0,0 @@
--- javacc-javacc-7.0.12/src/main/resources/templates/gwt/SimpleCharStream.template.orig	2022-12-23 03:58:07.000000000 -0700
-+++ javacc-javacc-7.0.12/src/main/resources/templates/gwt/SimpleCharStream.template	2023-03-26 11:28:53.769605854 -0600
-@@ -215,14 +215,13 @@ ${SUPPORT_CLASS_VISIBILITY_PUBLIC?public
-     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
- #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];
--- javacc-javacc-7.0.12/src/main/resources/templates/JavaCharStream.template.orig	2022-12-23 03:58:07.000000000 -0700
-+++ javacc-javacc-7.0.12/src/main/resources/templates/JavaCharStream.template	2023-03-25 10:14:49.496652118 -0600
-@@ -58,39 +58,66 @@ class JavaCharStream
-     throw new java.io.IOException(); // Should never come here
-   }
- 
-/* Position in buffer. */
-+  /** Position in buffer. */
-   ${PREFIX}public int bufpos = -1;
-+  /** Size of the buffer. */
-   ${PREFIX}int bufsize;
-+  /** Number of characters available in the buffer. */
-   ${PREFIX}int available;
-+  /** Buffer position of the first character of the current token. */
-   ${PREFIX}int tokenBegin;
- #if KEEP_LINE_COLUMN
-+  /** Line number of each buffer character. */
-   ${PREFIX}protected int bufline[];
-+  /** Column number of each buffer character. */
-   ${PREFIX}protected int bufcolumn[];
- 
-+  /** Current column number. */
-   ${PREFIX}protected int column = 0;
-+  /** Current line number. */
-   ${PREFIX}protected int line = 1;
- 
-+  /** True if the previous character is a carriage return. */
-   ${PREFIX}protected boolean prevCharIsCR = false;
-+  /** True if the previous character is a linefeed. */
-   ${PREFIX}protected boolean prevCharIsLF = false;
- #fi
- 
-+  /** The input stream from which characters are read. */
-   ${PREFIX}protected java.io.Reader inputStream;
- 
-+  /** The buffer containing the next character. */
-   ${PREFIX}protected char[] nextCharBuf;
-+  /* The buffer. */
-   ${PREFIX}protected char[] buffer;
-+  /** Index one beyond the last character in the buffer. */
-   ${PREFIX}protected int maxNextCharInd = 0;
-+  /** Index of the next character in the buffer. */
-   ${PREFIX}protected int nextCharInd = -1;
-+  /** The number of characters in the buffer. */
-   ${PREFIX}protected int inBuf = 0;
-+  /** The tab size. */
-   ${PREFIX}protected int tabSize = 1;
-+  /** Whether to track the line and column. */
- #if KEEP_LINE_COLUMN
-   ${PREFIX}protected boolean trackLineColumn = true;
- #else
-   ${PREFIX}protected boolean trackLineColumn = false;
- #fi
- 
-+  /** Set the tab size.
-+   * @param i the tab size
-+   */
-   ${PREFIX}public void setTabSize(int i) { tabSize = i; }
-+  /** Get the tab size.
-+   * @return the tab size.
-+   */
-   ${PREFIX}public int getTabSize() { return tabSize; }
- 
-+/**
-+ * Make the buffer bigger.
-+ * @param wrapAround true if the buffer wraps around
-+ */
-   ${PREFIX}protected void ExpandBuff(boolean wrapAround)
-   {
-     char[] newbuffer = new char[bufsize + 2048];
-@@ -144,6 +171,10 @@ class JavaCharStream
-     tokenBegin = 0;
-   }
- 
-+/**
-+ * Fill the buffer.
-+ * @throws java.io.IOException an exception occurs while filling the buffer
-+ */
-   ${PREFIX}protected void FillBuff() throws java.io.IOException
-   {
-     int i;
-@@ -178,6 +209,11 @@ class JavaCharStream
-     }
-   }
- 
-+/**
-+ * Read one byte.
-+ * @return the byte
-+ * @throws java.io.IOException an exception occurs while filling the buffer
-+ */
-   ${PREFIX}protected char ReadByte() throws java.io.IOException
-   {
-     if (++nextCharInd >= maxNextCharInd)
-@@ -186,7 +222,11 @@ class JavaCharStream
-     return nextCharBuf[nextCharInd];
-   }
- 
-/* @return starting character for token. */
-+/**
-+ * Get the first character of the token.
-+ * @return starting character for token.
-+ * @throws java.io.IOException an exception occurs while fetching a character
-+ */
-   ${PREFIX}public char BeginToken() throws java.io.IOException
-   {
-     if (inBuf > 0)
-@@ -206,6 +246,9 @@ class JavaCharStream
-     return readChar();
-   }
- 
-+/**
-+ * Get more buffer space if needed.
-+ */
-   ${PREFIX}protected void AdjustBuffSize()
-   {
-     if (available == bufsize)
-@@ -227,6 +270,9 @@ class JavaCharStream
-   }
- #if KEEP_LINE_COLUMN
- 
-+/** Update line and column due to adding a character.
-+ * @param c the character that is added
-+ */
-   ${PREFIX}protected void UpdateLineColumn(char c)
-   {
-     column++;
-@@ -268,7 +314,10 @@ class JavaCharStream
-   }
- #fi
- 
-/* Read a character. */
-+/** Read a character.
-+ * @return the character that is read
-+ * @throws java.io.IOException an error occurred while reading the character
-+ */
-   ${PREFIX}public char readChar() throws java.io.IOException
-   {
-     if (inBuf > 0)
-@@ -378,9 +427,10 @@ class JavaCharStream
-     }
-   }
- 
-  /*
-+  /**
-    * @deprecated
-    * @see #getEndColumn
-+   * @return the column number.
-    */
- #if GENERATE_ANNOTATIONS
-   @Deprecated
-@@ -393,7 +443,7 @@ class JavaCharStream
- #fi
-   }
- 
-  /*
-+  /**
-    * @deprecated
-    * @see #getEndLine
-    * @return the line number.
-@@ -450,7 +500,9 @@ class JavaCharStream
- #fi
-   }
- 
-/** Retreat. */
-+/** Retreat.
-+ * @param amount number of characters to back up
-+ */
-   ${PREFIX}public void backup(int amount) {
- 
-     inBuf += amount;
-@@ -501,13 +553,17 @@ class JavaCharStream
- 
- /** Constructor.
-  * @param dstream the underlying data source.
- * @param startline line number of the first character of the stream, mostly for error messages.
-  */
-   public JavaCharStream(java.io.Reader dstream)
-   {
-     this(dstream, 1, 1, 4096);
-   }
-/* Reinitialise. */
-+/** Reinitialise.
-+ * @param dstream the underlying data source.
-+ * @param startline line number of the first character of the stream, mostly for error messages.
-+ * @param startcolumn column number of the first character of the stream.
-+ * @param buffersize size of the buffer
-+ */
-   public void ReInit(java.io.Reader dstream,
-                  int startline, int startcolumn, int buffersize)
-   {
-@@ -534,19 +590,32 @@ class JavaCharStream
-     nextCharInd = bufpos = -1;
-   }
- 
-/* Reinitialise. */
-+/** Reinitialise.
-+ * @param dstream the underlying data source.
-+ * @param startline line number of the first character of the stream, mostly for error messages.
-+ * @param startcolumn column number of the first character of the stream.
-+ */
-   public void ReInit(java.io.Reader dstream,
-                                         int startline, int startcolumn)
-   {
-     ReInit(dstream, startline, startcolumn, 4096);
-   }
- 
-/* Reinitialise. */
-+/** Reinitialise.
-+ * @param dstream the underlying data source.
-+ */
-   public void ReInit(java.io.Reader dstream)
-   {
-     ReInit(dstream, 1, 1, 4096);
-   }
-/** Constructor. */
-+/** Constructor.
-+ * @param dstream the underlying data source.
-+ * @param encoding the character encoding of the data stream.
-+ * @param startline line number of the first character of the stream, mostly for error messages.
-+ * @param startcolumn column number of the first character of the stream.
-+ * @param buffersize size of the buffer
-+ * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported.
-+ */
-   public JavaCharStream(java.io.InputStream dstream, String encoding, int startline,
-   int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
-   {
-@@ -570,7 +639,7 @@ class JavaCharStream
-  * @param encoding the character encoding of the data stream.
-  * @param startline line number of the first character of the stream, mostly for error messages.
-  * @param startcolumn column number of the first character of the stream.
- * @throws UnsupportedEncodingException encoding is invalid or unsupported.
-+ * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported.
-  */
-   public JavaCharStream(java.io.InputStream dstream, String encoding, int startline,
-                         int startcolumn) throws java.io.UnsupportedEncodingException
-@@ -592,7 +661,7 @@ class JavaCharStream
- /** Constructor.
-  * @param dstream the underlying data source.
-  * @param encoding the character encoding of the data stream.
- * @throws UnsupportedEncodingException encoding is invalid or unsupported.
-+ * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported.
-  */
-   public JavaCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
-   {
-@@ -613,6 +682,7 @@ class JavaCharStream
-  * @param startline line number of the first character of the stream, mostly for error messages.
-  * @param startcolumn column number of the first character of the stream.
-  * @param buffersize size of the buffer
-+ * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported.
-  */
-   public void ReInit(java.io.InputStream dstream, String encoding, int startline,
-   int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
-@@ -636,7 +706,7 @@ class JavaCharStream
-  * @param encoding the character encoding of the data stream.
-  * @param startline line number of the first character of the stream, mostly for error messages.
-  * @param startcolumn column number of the first character of the stream.
- * @throws UnsupportedEncodingException encoding is invalid or unsupported.
-+ * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported.
-  */
-   public void ReInit(java.io.InputStream dstream, String encoding, int startline,
-                      int startcolumn) throws java.io.UnsupportedEncodingException
-@@ -656,7 +726,7 @@ class JavaCharStream
- /** Reinitialise.
-  * @param dstream the underlying data source.
-  * @param encoding the character encoding of the data stream.
- * @throws UnsupportedEncodingException encoding is invalid or unsupported.
-+ * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported.
-  */
-   public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
-   {
--- a/javacc.spec
+++ b/javacc.spec
@ -29,12 +29,13 @@
 #

 # Build in bootstrap mode on new architectures
-%bcond_with bootstrap
+%bcond bootstrap 0
+
+%global giturl  https://github.com/javacc/javacc

 Name:           javacc
-Version:        7.0.12
-Release:        1%{?dist}
-Epoch:          0
+Version:        7.0.13
+Release:        %autorelease
 Summary:        A parser/scanner generator for java

 # BSD-3-Clause: the project as a whole
@ -44,24 +45,20 @@ Summary:        A parser/scanner generator for java
 # - src/main/java/org/javacc/utils/OutputFileGenerator.java
 License:        BSD-3-Clause AND BSD-2-Clause
 URL:            https://javacc.org/
-Source0:        https://github.com/javacc/javacc/archive/%{name}-%{version}.tar.gz
+VCS:            git:%{giturl}.git
+Source:         %{giturl}/archive/%{name}-%{version}.tar.gz
 # Fix javadoc errors in the JavaCharStream template
 # https://github.com/javacc/javacc/pull/257
-Patch0:         0001-Fix-javadoc-errors-in-JavaCharStream.template.patch
-# Remove duplicate @Deprecated annotations
-# https://github.com/javacc/javacc/pull/259
-Patch1:         0002-Remove-extraneous-Deprecated-annotations.patch
+Patch:          0001-Fix-javadoc-errors-in-JavaCharStream.template.patch

-BuildRequires:  javapackages-local
-BuildRequires:  ant
-%if %{without bootstrap}
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
+BuildRequires:  javapackages-local-openjdk25
+BuildRequires:  ant-openjdk25 
 BuildRequires:  javacc
 %endif

-# Explicit javapackages-tools requires since scripts use
-# /usr/share/java-utils/java-functions
-Requires:       javapackages-tools
-
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch

@ -81,6 +78,8 @@ a tool called JJTree included with JavaCC), actions, debugging, etc.
 # ISC: docs/grammars/JSONParser.jjt
 License:        BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later AND (AFL-2.0 OR BSD-3-Clause) AND ISC
 Summary:        Manual for %{name}
+# TODO Remove in Fedora 46
+Obsoletes:      %{name}-javadoc < 7.0.13-5

 %description manual
 Manual for %{name}.
@ -92,15 +91,11 @@ Requires:       %{name} = %{version}-%{release}
 %description demo
 Examples for %{name}.

-%javadoc_package
-
 %prep
-%autosetup -n %{name}-%{name}-%{version} -p1
+%autosetup -p1 -C

-%if %{without bootstrap}
 # Remove binary information in the source tar
 find . -name "*.jar" -delete
-%endif
 find examples -name .gitignore -delete

 fixtimestamp() {
@ -117,13 +112,15 @@ sed -i.orig 's/\r//' examples/JJTreeExamples/cpp/eg3.jjt
 fixtimestamp examples/JJTreeExamples/cpp/eg3.jjt

 %build
-%if %{without bootstrap}
+%if %{with bootstrap}
+cp %{_datadir}/javapackages-bootstrap/javacc.jar bootstrap/javacc.jar
+%else
 build-jar-repository -p bootstrap javacc
 %endif

 # There is maven pom which doesn't really work for building. The tests don't
 # work either (even when using bundled jars).
-ant jar javadoc -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8
+%ant jar -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8

 # The pom dependencies are also wrong
 %mvn_artifact --skip-dependencies pom.xml target/javacc.jar
@ -131,17 +128,13 @@ ant jar javadoc -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8
 %install
 %mvn_file : %{name}

-%mvn_install -J target/javadoc
+%mvn_install

 %jpackage_script javacc '' '' javacc javacc true
-ln -s %{_bindir}/javacc %{buildroot}%{_bindir}/javacc.sh
+ln -s javacc %{buildroot}%{_bindir}/javacc.sh
 %jpackage_script jjdoc '' '' javacc jjdoc true
 %jpackage_script jjtree '' '' javacc jjtree true

-# Swizzle an absolute symlink into a relative symlink
-rm %{buildroot}%{_bindir}/javacc.sh
-ln -s javacc %{buildroot}%{_bindir}/javacc.sh
-
 %files -f .mfiles
 %license LICENSE
 %doc README.md
@ -157,184 +150,4 @@ ln -s javacc %{buildroot}%{_bindir}/javacc.sh
 %doc examples

 %changelog
-* Sat Apr  1 2023 Jerry James <loganjerry@gmail.com> - 0:7.0.12-1
- Update to 7.0.12
- Convert License tag to SPDX
- Add bootstrap build mode
- Add patch to fix javadoc errors in the JavaCharStream template
- Add patch to remove duplicate @Deprecated annotations
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.4-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.4-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 0:7.0.4-12
- Rebuilt for Drop i686 JDKs
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 0:7.0.4-11
- Rebuilt for java-17-openjdk as system jdk
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.4-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.4-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 20 2020 Mat Booth <mat.booth@redhat.com> - 0:7.0.4-6
- Force generation of 1.8 level bytecode to avoid breaking dependent packages
-  that require Java 8
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 0:7.0.4-5
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Oct 26 2018 Marian Koncek <mkoncek@redhat.com> - 0:7.0.4-1
- Update to upstream version 7.0.4
- Resolves: rhbz#1593262
-
-* Tue Jul 31 2018 Severin Gehwolf <sgehwolf@redhat.com> - 0:7.0.2-6
- Add requirement on javapackages-tools for scripts using
-  java-functions.
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Jan 16 2017 Michael Simacek <msimacek@redhat.com> - 0:7.0.2-1
- Update to upstream version 7.0.2
-
-* Mon Jan 02 2017 Michael Simacek <msimacek@redhat.com> - 0:7.0.1-1
- Update to upstream version 7.0.1
-
-* Tue Sep 06 2016 Michael Simacek <msimacek@redhat.com> - 0:6.1.3-1
- Update to upstream version 6.1.3
- Use new upstream location
- Generate scripts with jpackage_script
-
-* Tue Aug 23 2016 Michael Simacek <msimacek@redhat.com> - 0:6.1.2-1
- Update to upstream version 6.1.2
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:5.0-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Thu May 29 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:5.0-11
- Use .mfiles generated during build
-
-* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:5.0-10
- Use Requires: java-headless rebuild (#1067528)
-
-* Tue Jul 30 2013 Michal Srb <msrb@redhat.com> - 0:5.0-9
- Generate javadoc
- Drop group tag
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Thu Jun 28 2012 Jaromir Capik <jcapik@redhat.com> 0:5.0-6
- Fixing #835786 - javacc: Invalid upstream URL
- Minor spec file changes according to the latest guidelines
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Jul 13 2010 Alexander Kurtakov <akurtako@redhat.com> 0:5.0-3
- Fix examples line endings.
-
-* Fri Jun 4 2010 Alexander Kurtakov <akurtako@redhat.com> 0:5.0-2
- Apply changes requested in review bug (rhbz#225940).
-
-* Thu Feb 11 2010 Alexander Kurtakov <akurtako@redhat.com> 0:5.0-1
- Update to upstream 5.0 release.
-
-* Tue Nov 24 2009 Alexander Kurtakov <akurtako@redhat.com> 0:4.1-0.6
- Use standard permissions and fix unowned directories.
-
-* Tue Nov 24 2009 Alexander Kurtakov <akurtako@redhat.com> 0:4.1-0.5
- Fix rpmlint warnings.
- Drop gcj support.
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:4.1-0.4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:4.1-0.3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Dec 03 2008 Matt Wringe <mwringe@redhat.com> - 0:4.1-0.2
- Update to remove packaged jars in source tar
- Build with bootstrap jar so that required java source 
-  files get generated
-
-* Wed Oct 22 2008 Jerry James <loganjerry@gmail.com> - 0:4.1-0.1
- Update to 4.1
- Also ship the jjrun script
- Own the appropriate gcj directory
- Minor spec file changes to comply with latest Fedora guidelines
- Include the top-level index.html file in the manual
-
-* Wed Jul  9 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:4.0-4.5
- drop repotag
-
-* Fri Feb 22 2008 Matt Wringe <mwringe at redhat.com> - 0:4.0-4jpp.4
- Rename javacc script file to javacc.sh as this confuses the makefile
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0:4.0-4jpp.3
- Autorebuild for GCC 4.3
-
-* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> - 0:4.0-3jpp.3
- Rebuilt with new naming convention
-
-* Sat Jul 22 2006 Jakub Jelinek <jakub@redhat.com> - 0:4.0-3jpp_2fc
- Rebuilt
-
-* Tue Jul 18 2006 Matthew Wringe <mwringe at redhat.com> - 0:4.0-3jpp_1fc
- Merged with upstream version
- Changed directory locations to rpm macros
- Added conditional native compiling
-
-* Thu Apr 20 2006 Fernando Nasser <fnasser@redhat.com> - 0:4.0-2jpp
- First JPP 1.7 build
-
-* Fri Mar 31 2006 Sebastiano Vigna <vigna at acm.org> - 0:4.0-1jpp
- Updated to 4.0
-
-* Mon Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:3.2-2jpp
- Rebuild with ant-1.6.2
-
-* Fri Jan 30 2004 Sebastiano Vigna <vigna at acm.org> 0:3.2-1jpp
- First JPackage version
+%autochangelog
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@ -0,0 +1,7 @@
+summary: Run javapackages-specific tests
+discover:
+  how: fmf
+  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
+  ref: f43
+execute:
+  how: tmt
--- a/plans/smoke.fmf
+++ b/plans/smoke.fmf
@ -0,0 +1,5 @@
+summary: Basic smoke test
+discover:
+  how: fmf
+execute:
+  how: tmt
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (javacc-7.0.12.tar.gz) = 963983d39696705051cf568201a17ccc63995f90572782fdbf2b1df4d20b682f7b6f69b5d7e950db9e27f30eac961b483e813bccb91a10365e0836b905cbe3fc
+SHA512 (javacc-7.0.13.tar.gz) = ed71e47fc4a382c9c53067bbf73bd9736ee0c41d65e328d5e4843cd71c88d3b7715d7a8fe38f10152ef7ef3be064abf9e801c6ea78066c4fcbabf124dfc4e144
--- a/tests/Sanity/smoke/main.fmf
+++ b/tests/Sanity/smoke/main.fmf
@ -0,0 +1,6 @@
+summary: javacc smoke test
+description: |
+  Test basic functionality of javacc.
+require:
+  - javacc
+  - java-devel
--- a/tests/Sanity/smoke/runtest.sh
+++ b/tests/Sanity/smoke/runtest.sh
@ -0,0 +1,48 @@
+#!/bin/bash
+# Author: Mikolaj Izdebski <mizdebsk@redhat.com>
+. /usr/share/beakerlib/beakerlib.sh
+
+rlJournalStart
+
+  rlPhaseStartTest "check for presence of javacc commands"
+    rlAssertRpm javacc
+    rlAssertBinaryOrigin javacc javacc
+    rlAssertBinaryOrigin javacc.sh javacc
+    rlAssertBinaryOrigin jjtree javacc
+    rlAssertBinaryOrigin jjdoc javacc
+  rlPhaseEnd
+
+  rlPhaseStartTest "display javacc version"
+    rlRun -s "javacc" 1
+    rlAssertGrep "^Java Compiler Compiler Version" $rlRun_LOG
+    rlAssertGrep "Parser Generator" $rlRun_LOG
+    rlRun -s "javacc.sh" 1
+    rlAssertGrep "^Java Compiler Compiler Version" $rlRun_LOG
+    rlAssertGrep "Parser Generator" $rlRun_LOG
+  rlPhaseEnd
+
+  rlPhaseStartTest "display jjtree version"
+    rlRun -s "jjtree" 1
+    rlAssertGrep "^Java Compiler Compiler Version" $rlRun_LOG
+    rlAssertGrep "Tree Builder" $rlRun_LOG
+  rlPhaseEnd
+
+  rlPhaseStartTest "display jjdoc version"
+    rlRun -s "jjdoc" 1
+    rlAssertGrep "^Java Compiler Compiler Version" $rlRun_LOG
+    rlAssertGrep "Documentation Generator" $rlRun_LOG
+  rlPhaseEnd
+
+  rlPhaseStartTest "generate, compile and run a simple parser"
+    rlRun -s "javacc smoke.jj"
+    rlAssertExists "Smoke.java"
+    rlRun -s "javac *.java"
+    rlRun -s "java -cp . Smoke '{}'"
+    rlAssertNotGrep "." $rlRun_LOG
+    rlRun -s "java -cp . Smoke '{{}'" 1
+    rlAssertGrep "ParseException" $rlRun_LOG
+    rlAssertGrep "EOF" $rlRun_LOG
+  rlPhaseEnd
+
+rlJournalEnd
+rlJournalPrintText
--- a/tests/Sanity/smoke/smoke.jj
+++ b/tests/Sanity/smoke/smoke.jj
@ -0,0 +1,50 @@
+options {
+  LOOKAHEAD = 1;
+  CHOICE_AMBIGUITY_CHECK = 2;
+  OTHER_AMBIGUITY_CHECK = 1;
+  STATIC = true;
+  DEBUG_PARSER = false;
+  DEBUG_LOOKAHEAD = false;
+  DEBUG_TOKEN_MANAGER = false;
+  ERROR_REPORTING = true;
+  JAVA_UNICODE_ESCAPE = false;
+  UNICODE_INPUT = false;
+  IGNORE_CASE = false;
+  USER_TOKEN_MANAGER = false;
+  USER_CHAR_STREAM = false;
+  BUILD_PARSER = true;
+  BUILD_TOKEN_MANAGER = true;
+  SANITY_CHECK = true;
+  FORCE_LA_CHECK = false;
+}
+
+PARSER_BEGIN(Smoke)
+
+/**
+ * Simple brace matcher.
+ */
+public class Smoke {
+
+  /** Main entry point. */
+  public static void main(String args[]) throws ParseException {
+    Smoke parser = new Smoke(new java.io.StringReader(args[0]));
+    parser.Input();
+  }
+
+}
+
+PARSER_END(Smoke)
+
+/** Root production. */
+void Input() :
+{}
+{
+  MatchedBraces() ("\n"|"\r")* <EOF>
+}
+
+/** Brace matching production. */
+void MatchedBraces() :
+{}
+{
+  "{" [ MatchedBraces() ] "}"
+}
--- a/tests/main.fmf
+++ b/tests/main.fmf
@ -0,0 +1,4 @@
+contact: Mikolaj Izdebski <mizdebsk@redhat.com>
+framework: beakerlib
+test: ./runtest.sh
+tier: 1
Author	SHA1	Message	Date
Jiri Vanek	b814a29efa	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.	2025-07-30 12:17:17 +02:00
Jiri Vanek	1c43cccf0c	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.	2025-07-29 21:14:42 +02:00
Fedora Release Engineering	6ab834ef62	Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild	2025-07-24 17:56:15 +00:00
Jerry James	9f1a6b4970	Restore JavaCharStream.template patch This patch is not for producing javadocs from this package, but rather to generate code with correct javadoc comments. Its removal breaks other software that uses the JavaCharStream template.	2025-07-15 06:50:16 -06:00
Mikolaj Izdebski	68e1f5c452	Remove javadoc subpackage	2025-07-13 21:25:43 +02:00
Mikolaj Izdebski	2326bbb04d	Update bootstrap JAR path - Build with OpenJDK 25	2025-07-11 21:04:03 +02:00
Mikolaj Izdebski	b12a0e75fe	Switch javapackages test plan to f43 ref	2025-05-22 13:35:31 +02:00
Mikolaj Izdebski	caca8d054e	Switch to javapackages tests from CentOS Stream GitLab	2025-03-26 08:43:19 +01:00
Mikolaj Izdebski	19460bf8d7	Drop explicit zero epoch	2025-03-05 13:46:10 +01:00
Fedora Release Engineering	e86df2081f	Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild	2025-01-17 07:42:46 +00:00
Mikolaj Izdebski	5a0c90d985	Drop explicit requires on javapackages-tools	2024-11-29 07:37:45 +01:00
Jerry James	45d8b3cc84	Avoid unexpanded macro in package %description	2024-11-20 11:38:01 -07:00
Mikolaj Izdebski	9e92d9ed85	Convert to %autorelease and %autochangelog	2024-08-23 00:45:49 +02:00
Mikolaj Izdebski	b7d5ff9c2a	Use %autosetup -C	2024-08-20 16:32:53 +02:00
Mikolaj Izdebski	a2f5f324bd	Switch javapackages tests to f41 branch	2024-07-31 20:53:29 +02:00
Mikolaj Izdebski	ab8e9d3d87	Adjust bootstrap build for javapackages-bootstrap update	2024-07-30 13:40:20 +02:00
Fedora Release Engineering	b78d906393	Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild	2024-07-18 10:52:29 +00:00
Jerry James	e5ef0ce401	Minor spec file simplifications	2024-07-16 18:32:54 -06:00
Mikolaj Izdebski	0777dc670e	Tests should explicitly require package under test	2024-06-26 16:24:56 +02:00
Jiri Vanek	13f860a345	Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21	2024-02-27 16:05:07 +01:00
Jiri	fe496eb0ad	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	2024-02-23 14:22:44 +01:00
Fedora Release Engineering	319fc600aa	Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild	2024-01-24 23:11:56 +00:00
Fedora Release Engineering	b629de5ab5	Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild	2024-01-20 23:32:05 +00:00
Mikolaj Izdebski	7cc5d2b797	Update javapackages test plan to f40	2023-12-07 12:28:36 +01:00
Jerry James	d418395be2	Update to 7.0.13 Drop upstreamed duplicated @Deprecated annotations patch	2023-11-17 08:54:34 -07:00
Mikolaj Izdebski	ad7241b5e1	Rebuild	2023-09-01 15:58:22 +02:00
Mikolaj Izdebski	a8e43f1517	Bootstrap using javapackages-bootstrap	2023-08-26 10:31:59 +02:00
Mikolaj Izdebski	527d9d9d5b	Simplify symlink creation	2023-08-26 10:31:59 +02:00
Mikolaj Izdebski	8e5048e657	Onboard package into gating	2023-08-26 10:15:13 +02:00
Fedora Release Engineering	06b3e0e5f9	Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2023-07-20 07:55:26 +00:00