Merge pull request #3256 from ebean-orm/feature/upgrade-antlr4-4_13_1

Upgrade ANTLR4 from version 4.8-1 to 4.13.1
ebean-orm · Oct 27, 2023 · 7a5e8d0 · 7a5e8d0
2 parents 9f65673 + a0748f8
commit 7a5e8d0
Show file tree

Hide file tree

Showing 9 changed files with 782 additions and 473 deletions.
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>org.antlr</groupId>
       <artifactId>antlr4-runtime</artifactId>
-      <version>4.8-1</version>
+      <version>4.13.1</version>
     </dependency>
 
     <!--

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.interp b/ebean-core/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.interp
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
@@ -1,4 +1,4 @@
-// Generated from /home/rob/github/ebean-dir/ebean/src/test/resources/EQL.g4 by ANTLR 4.8
+// Generated from /Users/robinbygrave/Documents/github/ebean/ebean/ebean-test/src/test/resources/EQL.g4 by ANTLR 4.13.1
 package io.ebeaninternal.server.grammer.antlr;
 
 import org.antlr.v4.runtime.ParserRuleContext;
@@ -10,6 +10,7 @@
  * which can be extended to create a listener which only needs to handle a subset
  * of the available methods.
  */
+@SuppressWarnings("CheckReturnValue")
 public class EQLBaseListener implements EQLListener {
 	/**
 	 * {@inheritDoc}

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseVisitor.java b/ebean-core/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseVisitor.java
@@ -1,4 +1,4 @@
-// Generated from /home/rob/github/ebean-dir/ebean/src/test/resources/EQL.g4 by ANTLR 4.8
+// Generated from /Users/robinbygrave/Documents/github/ebean/ebean/ebean-test/src/test/resources/EQL.g4 by ANTLR 4.13.1
 package io.ebeaninternal.server.grammer.antlr;
 import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
 
@@ -10,6 +10,7 @@
  * @param <T> The return type of the visit operation. Use {@link Void} for
  * operations with no return type.
  */
+@SuppressWarnings("CheckReturnValue")
 public class EQLBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements EQLVisitor<T> {
 	/**
 	 * {@inheritDoc}

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp b/ebean-core/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java b/ebean-core/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
@@ -1,4 +1,4 @@
-// Generated from /home/rob/github/ebean-dir/ebean/src/test/resources/EQL.g4 by ANTLR 4.8
+// Generated from /Users/robinbygrave/Documents/github/ebean/ebean/ebean-test/src/test/resources/EQL.g4 by ANTLR 4.13.1
 package io.ebeaninternal.server.grammer.antlr;
 import org.antlr.v4.runtime.tree.ParseTreeListener;
 

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLVisitor.java b/ebean-core/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLVisitor.java
@@ -1,4 +1,4 @@
-// Generated from /home/rob/github/ebean-dir/ebean/src/test/resources/EQL.g4 by ANTLR 4.8
+// Generated from /Users/robinbygrave/Documents/github/ebean/ebean/ebean-test/src/test/resources/EQL.g4 by ANTLR 4.13.1
 package io.ebeaninternal.server.grammer.antlr;
 import org.antlr.v4.runtime.tree.ParseTreeVisitor;