Skip to content

deps(java): bump net.java.dev.javacc:javacc from 7.0.12 to 7.0.13 #14576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rmuir merged 2 commits into from
Apr 30, 2025
Merged

deps(java): bump net.java.dev.javacc:javacc from 7.0.12 to 7.0.13 #14576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75e1e93
deps(java): bump net.java.dev.javacc:javacc from 7.0.12 to 7.0.13
dependabot[bot] Apr 30, 2025
c94bb0b
./gradlew regenerate --rerun-tasks
rmuir Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ googleJavaFormat = "1.23.0"
groovy = "4.0.26"
hamcrest = "2.2"
icu4j = "77.1"
javacc = "7.0.12"
javacc = "7.0.13"
jflex = "1.8.2"
jgit = "6.10.0.202406032230-r"
jmh = "1.37"
Expand Down
4 changes: 2 additions & 2 deletions lucene/analysis/common/src/generated/checksums/generateTlds.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"lucene/analysis/common/src/java/org/apache/lucene/analysis/email/ASCIITLD.jflex": "796548e0fbf0688225824e65473167dbb478adc4",
"lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TLDs.txt": "84ccf9a61fb66f1f882fbbeb56efe8e21ba74b41",
"lucene/analysis/common/src/java/org/apache/lucene/analysis/email/ASCIITLD.jflex": "988bedbb92652a34920b021a39be0423f206c5e1",
"lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TLDs.txt": "2e6aee8d672e3cb5f5b7061c1f7172c45cdd9fa3",
"property:tldZones": "https://data.iana.org/TLD/tlds-alpha-by-domain.txt"
}
4 changes: 2 additions & 2 deletions lucene/analysis/common/src/generated/checksums/generateUAX29URLEmailTokenizer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"gradle/generation/jflex/skeleton.disable.buffer.expansion.txt": "6e43a3a64a9b5eb82ec5b4bc21f95aff5a2a061e",
"lucene/analysis/common/src/java/org/apache/lucene/analysis/email/ASCIITLD.jflex": "796548e0fbf0688225824e65473167dbb478adc4",
"lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerImpl.java": "ad17a3b0bc254749685ac34c3071bb0881f7b185",
"lucene/analysis/common/src/java/org/apache/lucene/analysis/email/ASCIITLD.jflex": "988bedbb92652a34920b021a39be0423f206c5e1",
"lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerImpl.java": "10528b8d07cedea9c7969a694ae4c486e4104e19",
"lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerImpl.jflex": "8d7cd1a935443deda6cad73b91f1a45c1c714535"
}
3 changes: 1 addition & 2 deletions lucene/analysis/common/src/java/org/apache/lucene/analysis/email/ASCIITLD.jflex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/
// Generated from IANA TLD Database <https://data.iana.org/TLD/tlds-alpha-by-domain.txt>
// file version from 2025 Apr 22, Tue 07:07:01 GMT
// file version from 2025 Apr 29, Tue 07:07:01 GMT
// generated by org.apache.lucene.analysis.standard.GenerateJflexTLDMacros

// LUCENE-8278: None of the TLDs in {ASCIITLD} is a 1-character-shorter prefix of another TLD
Expand Down Expand Up @@ -123,7 +123,6 @@ ASCIITLD = "." (
| [bB][eE][aA][tT][sS]
| [bB][eE][aA][uU][tT][yY]
| [bB][eE][eE][rR]
| [bB][eE][nN][tT][lL][eE][yY]
| [bB][eE][rR][lL][iI][nN]
| [bB][eE][sS][tT]
| [bB][eE][sS][tT][bB][uU][yY]
Expand Down
41,774 changes: 20,814 additions & 20,960 deletions ...analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerImpl.java
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TLDs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ be
beats
beauty
beer
bentley
berlin
best
bestbuy
Expand Down
2 changes: 1 addition & 1 deletion lucene/queryparser/src/generated/checksums/javaccParserClassic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserConstants.java": "e59a3fd38b66a3d56779c55955c1e014225a1f50",
"lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserTokenManager.java": "dc99a1083bfa50e429d40e114fabe7dd5d434693",
"lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/Token.java": "310665ba37d982327fcb55cc3523d629ef29ef54",
"lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/TokenMgrError.java": "7e2dd6ab7489048bb70f3077ca9fed90f925ec33"
"lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/TokenMgrError.java": "31afe7034729960514f50fdc3c9b33e0def44f1d"
}
2 changes: 1 addition & 1 deletion lucene/queryparser/src/generated/checksums/javaccParserFlexible.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserConstants.java": "4ad426d4f4b7577f4af4e9057de32c65c83b1812",
"lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserTokenManager.java": "c264cc500a3964751827a9567ac230eda9783d9f",
"lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/Token.java": "f4cb9d01587279dba30e549ce4867e4381bbd9d7",
"lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/TokenMgrError.java": "ff4008e6f76aa09dd48ff7c35190d7326bcf9849"
"lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/TokenMgrError.java": "8dc34288301da07c6264d9fb8e61f82ad35e5db7"
}
2 changes: 1 addition & 1 deletion lucene/queryparser/src/generated/checksums/javaccParserSurround.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserConstants.java": "8feb77878890c27e874be457d839eba48192c40f",
"lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserTokenManager.java": "959523aec4e49f9665e39f16e1da335aab3632d1",
"lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/Token.java": "a5eea2a3043e0aa2781f4a43b9ab9c5d59add80e",
"lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/TokenMgrError.java": "144209e39095e049350ef17e2750df268d76edc5"
"lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/TokenMgrError.java": "ee5fbd796ed8bd1c6e1a4b9e3d894f391da36236"
}
3 changes: 2 additions & 1 deletion lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/TokenMgrError.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
package org.apache.lucene.queryparser.classic;

/** Token Manager Error. */
@SuppressWarnings("all")
public class TokenMgrError extends Error
{

Expand Down Expand Up @@ -106,7 +107,7 @@ protected static String LexicalErr(boolean EOFSeen, int lexState, int errorLine,
return("Lexical error at line " + //
errorLine + ", column " + //
errorColumn + ". Encountered: " + //
(EOFSeen ? "<EOF>" : ("'" + addEscapes(String.valueOf(curChar)) + "' (" + curChar + "),")) + //
(EOFSeen ? "<EOF>" : ("'" + addEscapes(String.valueOf((char) curChar)) + "' (" + curChar + "),")) + //
(errorAfter == null || errorAfter.length() == 0 ? "" : " after prefix \"" + addEscapes(errorAfter) + "\"")) + //
(lexState == 0 ? "" : " (in lexical state " + lexState + ")");
}
Expand Down
3 changes: 2 additions & 1 deletion ...parser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/TokenMgrError.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
package org.apache.lucene.queryparser.flexible.standard.parser;

/** Token Manager Error. */
@SuppressWarnings("all")
public class TokenMgrError extends Error
{

Expand Down Expand Up @@ -106,7 +107,7 @@ protected static String LexicalErr(boolean EOFSeen, int lexState, int errorLine,
return("Lexical error at line " + //
errorLine + ", column " + //
errorColumn + ". Encountered: " + //
(EOFSeen ? "<EOF>" : ("'" + addEscapes(String.valueOf(curChar)) + "' (" + curChar + "),")) + //
(EOFSeen ? "<EOF>" : ("'" + addEscapes(String.valueOf((char) curChar)) + "' (" + curChar + "),")) + //
(errorAfter == null || errorAfter.length() == 0 ? "" : " after prefix \"" + addEscapes(errorAfter) + "\"")) + //
(lexState == 0 ? "" : " (in lexical state " + lexState + ")");
}
Expand Down
3 changes: 2 additions & 1 deletion lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/TokenMgrError.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
package org.apache.lucene.queryparser.surround.parser;

/** Token Manager Error. */
@SuppressWarnings("all")
public class TokenMgrError extends Error
{

Expand Down Expand Up @@ -106,7 +107,7 @@ protected static String LexicalErr(boolean EOFSeen, int lexState, int errorLine,
return("Lexical error at line " + //
errorLine + ", column " + //
errorColumn + ". Encountered: " + //
(EOFSeen ? "<EOF>" : ("'" + addEscapes(String.valueOf(curChar)) + "' (" + curChar + "),")) + //
(EOFSeen ? "<EOF>" : ("'" + addEscapes(String.valueOf((char) curChar)) + "' (" + curChar + "),")) + //
(errorAfter == null || errorAfter.length() == 0 ? "" : " after prefix \"" + addEscapes(errorAfter) + "\"")) + //
(lexState == 0 ? "" : " (in lexical state " + lexState + ")");
}
Expand Down