Apache Lucene open-source search software
bump antlr 4.11.1 -> 4.13.2 (#14388)
Robert Muir2e87de1333d2
diff --git a/gradle/generation/antlr.gradle b/gradle/generation/antlr.gradleindex 9ccb522fb4c..729d039c5f9 100644--- a/gradle/generation/antlr.gradle+++ b/gradle/generation/antlr.gradle@@ -44,6 +44,7 @@ configure(project(":lucene:expressions")) {def tempOutput = file("$buildDir/antlr")def outputFiles = fileTree(dir: sourceDir, includes: generatedPatterns)+ inputs.property "antlr-version", deps.antlr.core.get().versioninputs.files inputFilesoutputs.files outputFilesdiff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex d8170266060..de9ec332aea 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -236,6 +236,8 @@ Other* GITHUB#14386: Bump analysis/icu's icu4j dependency to 77.1 (Robert Muir)+* GITHUB#14388: Bump expression's antlr dependency to 4.13.2 (Dawid Weiss, Robert Muir)+======================= Lucene 10.1.0 =======================API Changesdiff --git a/lucene/expressions/src/generated/checksums/generateAntlr.json b/lucene/expressions/src/generated/checksums/generateAntlr.jsonindex 1f61888a1c6..61c1dddcfdf 100644--- a/lucene/expressions/src/generated/checksums/generateAntlr.json+++ b/lucene/expressions/src/generated/checksums/generateAntlr.json@@ -1,7 +1,8 @@{"lucene/expressions/src/java/org/apache/lucene/expressions/js/Javascript.g4": "818e89aae0b6c7601051802013898c128fe7c1ba","lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptBaseVisitor.java": "6965abdb8b069aaceac1ce4f32ed965b194f3a25",- "lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptLexer.java": "b8d6b259ebbfce09a5379a1a2aa4c1ddd4e378eb",- "lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptParser.java": "7a3a7b9de17f4a8d41ef342312eae5c55e483e08",- "lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptVisitor.java": "ec24bb2b9004bc38ee808970870deed12351039e"+ "lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptLexer.java": "6508dc5008e96a1ad28c967a3401407ba83f140b",+ "lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptParser.java": "ba6d0c00af113f115fc7a1f165da7726afb2e8c5",+ "lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptVisitor.java": "ec24bb2b9004bc38ee808970870deed12351039e",+ "property:antlr-version": "4.13.2"}\ No newline at end of filediff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptLexer.java b/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptLexer.javaindex e83ffa2cb63..21169bde3a1 100644--- a/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptLexer.java+++ b/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptLexer.java@@ -8,10 +8,18 @@ import org.antlr.v4.runtime.atn.*;import org.antlr.v4.runtime.dfa.DFA;import org.antlr.v4.runtime.misc.*;-@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue"})+@SuppressWarnings({+ "all",+ "warnings",+ "unchecked",+ "unused",+ "cast",+ "CheckReturnValue",+ "this-escape"+})class JavascriptLexer extends Lexer {static {- RuntimeMetaData.checkVersion("4.11.1", RuntimeMetaData.VERSION);+ RuntimeMetaData.checkVersion("4.13.2", RuntimeMetaData.VERSION);}protected static final DFA[] _decisionToDFA;diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptParser.java b/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptParser.javaindex dbacd6aa75f..0ad4309b248 100644--- a/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptParser.java+++ b/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptParser.java@@ -8,10 +8,18 @@ import org.antlr.v4.runtime.dfa.DFA;import org.antlr.v4.runtime.misc.*;import org.antlr.v4.runtime.tree.*;-@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue"})+@SuppressWarnings({+ "all",+ "warnings",+ "unchecked",+ "unused",+ "cast",+ "CheckReturnValue",+ "this-escape"+})class JavascriptParser extends Parser {static {- RuntimeMetaData.checkVersion("4.11.1", RuntimeMetaData.VERSION);+ RuntimeMetaData.checkVersion("4.13.2", RuntimeMetaData.VERSION);}protected static final DFA[] _decisionToDFA;@@ -136,7 +144,7 @@ class JavascriptParser extends Parser {@Overridepublic String getGrammarFileName() {- return "java-escape";+ return "Javascript.g4";}@Override@@ -721,7 +729,7 @@ class JavascriptParser extends Parser {_prevctx = _localctx;setState(12);_la = _input.LA(1);- if (!(((_la) & ~0x3f) == 0 && ((1L << _la) & 3758096384L) != 0)) {+ if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & 3758096384L) != 0))) {_errHandler.recoverInline(this);} else {if (_input.LA(1) == Token.EOF) matchedEOF = true;@@ -747,7 +755,7 @@ class JavascriptParser extends Parser {setState(23);_errHandler.sync(this);_la = _input.LA(1);- if (((_la) & ~0x3f) == 0 && ((1L << _la) & 4026533426L) != 0) {+ if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 4026533426L) != 0)) {{setState(15);expression(0);@@ -787,7 +795,7 @@ class JavascriptParser extends Parser {_prevctx = _localctx;setState(28);_la = _input.LA(1);- if (!(((_la) & ~0x3f) == 0 && ((1L << _la) & 1584L) != 0)) {+ if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & 1584L) != 0))) {_errHandler.recoverInline(this);} else {if (_input.LA(1) == Token.EOF) matchedEOF = true;@@ -822,7 +830,7 @@ class JavascriptParser extends Parser {throw new FailedPredicateException(this, "precpred(_ctx, 11)");setState(33);_la = _input.LA(1);- if (!(((_la) & ~0x3f) == 0 && ((1L << _la) & 448L) != 0)) {+ if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & 448L) != 0))) {_errHandler.recoverInline(this);} else {if (_input.LA(1) == Token.EOF) matchedEOF = true;@@ -862,7 +870,7 @@ class JavascriptParser extends Parser {throw new FailedPredicateException(this, "precpred(_ctx, 9)");setState(39);_la = _input.LA(1);- if (!(((_la) & ~0x3f) == 0 && ((1L << _la) & 14336L) != 0)) {+ if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & 14336L) != 0))) {_errHandler.recoverInline(this);} else {if (_input.LA(1) == Token.EOF) matchedEOF = true;@@ -883,7 +891,7 @@ class JavascriptParser extends Parser {throw new FailedPredicateException(this, "precpred(_ctx, 8)");setState(42);_la = _input.LA(1);- if (!(((_la) & ~0x3f) == 0 && ((1L << _la) & 245760L) != 0)) {+ if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & 245760L) != 0))) {_errHandler.recoverInline(this);} else {if (_input.LA(1) == Token.EOF) matchedEOF = true;diff --git a/lucene/licenses/antlr4-runtime-4.11.1.jar.sha1 b/lucene/licenses/antlr4-runtime-4.11.1.jar.sha1deleted file mode 100644index 73976600b73..00000000000--- a/lucene/licenses/antlr4-runtime-4.11.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-069214c1de1960040729702eb58deac8827135e7diff --git a/lucene/licenses/antlr4-runtime-4.13.2.jar.sha1 b/lucene/licenses/antlr4-runtime-4.13.2.jar.sha1new file mode 100644index 00000000000..1c2007a4c9d--- /dev/null+++ b/lucene/licenses/antlr4-runtime-4.13.2.jar.sha1@@ -0,0 +1 @@+fc3db6d844df652a3d5db31c87fa12757f13691ddiff --git a/versions.lock b/versions.lockindex 7a5ded7f9ff..25c45ab9b7c 100644--- a/versions.lock+++ b/versions.lock@@ -9,7 +9,7 @@"junit:junit:4.13.1" : "fa9ef26b,refs=4","net.sf.jopt-simple:jopt-simple:5.0.4" : "85a1e4c6,refs=2","net.sourceforge.nekohtml:nekohtml:1.9.17" : "5ce8cdc6,refs=2",- "org.antlr:antlr4-runtime:4.11.1" : "d9953130,refs=4",+ "org.antlr:antlr4-runtime:4.13.2" : "d9953130,refs=4","org.apache.commons:commons-compress:1.19" : "5ce8cdc6,refs=2","org.apache.commons:commons-math3:3.6.1" : "85a1e4c6,refs=2","org.apache.opennlp:opennlp-tools:2.5.3" : "2f760bab,refs=4",@@ -54,7 +54,7 @@"junit:junit:4.13.1" : "b35e5d7a,refs=74","net.sf.jopt-simple:jopt-simple:5.0.4" : "152d9f78,refs=3","net.sourceforge.nekohtml:nekohtml:1.9.17" : "6f16ff86,refs=2",- "org.antlr:antlr4-runtime:4.11.1" : "6fbc4021,refs=5",+ "org.antlr:antlr4-runtime:4.13.2" : "6fbc4021,refs=5","org.apache.commons:commons-compress:1.19" : "6f16ff86,refs=2","org.apache.commons:commons-math3:3.6.1" : "152d9f78,refs=3","org.apache.opennlp:opennlp-tools:2.5.3" : "b91715f0,refs=6",diff --git a/versions.toml b/versions.tomlindex 061d93260c4..ae7a9b518cb 100644--- a/versions.toml+++ b/versions.toml@@ -1,6 +1,6 @@# Run "gradlew writeLocks" and "gradlew updateLicenses" after modifying this file![versions]-antlr = "4.11.1"+antlr = "4.13.2"asm = "9.6"assertj = "3.21.0"commons-codec = "1.17.2"