Date: Mon, 31 Aug 2020 14:14:53 +0800
Subject: [PATCH] fix use system antlr

---
 .../internal/parsing/ejbql/EJBQLParser.java   | 26 +++++++++----------
 .../ejbql/antlr273/EJBQLParserBuilder.java    |  2 +-
 .../parsing/ejbql/antlr273/EJBQLLexer.java    | 42 +++++++++----------
 .../parsing/ejbql/antlr273/EJBQLParser.java   | 26 ++++++------
 4 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/src/main/java/oracle/toplink/essentials/internal/parsing/ejbql/EJBQLParser.java b/src/main/java/oracle/toplink/essentials/internal/parsing/ejbql/EJBQLParser.java
index 5faab5c..9c9cf20 100644
--- a/src/main/java/oracle/toplink/essentials/internal/parsing/ejbql/EJBQLParser.java
+++ b/src/main/java/oracle/toplink/essentials/internal/parsing/ejbql/EJBQLParser.java
@@ -42,19 +42,19 @@ import java.util.List;
 import java.util.ArrayList;
 
 // Third party (ANLTR) stuff
-import persistence.antlr.ANTLRException;
-import persistence.antlr.LLkParser;
-import persistence.antlr.MismatchedCharException;
-import persistence.antlr.MismatchedTokenException;
-import persistence.antlr.NoViableAltException;
-import persistence.antlr.NoViableAltForCharException;
-import persistence.antlr.ParserSharedInputState;
-import persistence.antlr.RecognitionException;
-import persistence.antlr.Token;
-import persistence.antlr.TokenBuffer;
-import persistence.antlr.TokenStream;
-import persistence.antlr.TokenStreamException;
-import persistence.antlr.TokenStreamRecognitionException;
+import antlr.ANTLRException;
+import antlr.LLkParser;
+import antlr.MismatchedCharException;
+import antlr.MismatchedTokenException;
+import antlr.NoViableAltException;
+import antlr.NoViableAltForCharException;
+import antlr.ParserSharedInputState;
+import antlr.RecognitionException;
+import antlr.Token;
+import antlr.TokenBuffer;
+import antlr.TokenStream;
+import antlr.TokenStreamException;
+import antlr.TokenStreamRecognitionException;
 
 //toplink imports
 import oracle.toplink.essentials.exceptions.EJBQLException;
diff --git a/src/main/java/oracle/toplink/essentials/internal/parsing/ejbql/antlr273/EJBQLParserBuilder.java b/src/main/java/oracle/toplink/essentials/internal/parsing/ejbql/antlr273/EJBQLParserBuilder.java
index 9bf432a..26a3d3f 100644
--- a/src/main/java/oracle/toplink/essentials/internal/parsing/ejbql/antlr273/EJBQLParserBuilder.java
+++ b/src/main/java/oracle/toplink/essentials/internal/parsing/ejbql/antlr273/EJBQLParserBuilder.java
@@ -38,7 +38,7 @@
 // Copyright (c) 1998, 2007, Oracle. All rights reserved.  
 package oracle.toplink.essentials.internal.parsing.ejbql.antlr273;
 
-import persistence.antlr.TokenBuffer;
+import antlr.TokenBuffer;
 
 //java imports
 import java.io.StringReader;
diff --git a/src/main/java/oracle/toplink/essentials/internal/parsing/ejbql/antlr273/EJBQLLexer.java b/src/main/java/oracle/toplink/essentials/internal/parsing/ejbql/antlr273/EJBQLLexer.java
index 571c3e2..a6b594a 100644
--- a/src/main/java/oracle/toplink/essentials/internal/parsing/ejbql/antlr273/EJBQLLexer.java
+++ b/src/main/java/oracle/toplink/essentials/internal/parsing/ejbql/antlr273/EJBQLLexer.java
@@ -9,31 +9,31 @@
     import oracle.toplink.essentials.exceptions.EJBQLException;

 import java.io.InputStream;
-import persistence.antlr.TokenStreamException;
-import persistence.antlr.TokenStreamIOException;
-import persistence.antlr.TokenStreamRecognitionException;
-import persistence.antlr.CharStreamException;
-import persistence.antlr.CharStreamIOException;
-import persistence.antlr.ANTLRException;
+import antlr.TokenStreamException;
+import antlr.TokenStreamIOException;
+import antlr.TokenStreamRecognitionException;
+import antlr.CharStreamException;
+import antlr.CharStreamIOException;
+import antlr.ANTLRException;
 import java.io.Reader;
 import java.util.Hashtable;
-import persistence.antlr.CharScanner;
-import persistence.antlr.InputBuffer;
-import persistence.antlr.ByteBuffer;
-import persistence.antlr.CharBuffer;
-import persistence.antlr.Token;
-import persistence.antlr.CommonToken;
-import persistence.antlr.RecognitionException;
-import persistence.antlr.NoViableAltForCharException;
-import persistence.antlr.MismatchedCharException;
-import persistence.antlr.TokenStream;
-import persistence.antlr.ANTLRHashString;
-import persistence.antlr.LexerSharedInputState;
-import persistence.antlr.collections.impl.BitSet;
-import persistence.antlr.SemanticException;
+import antlr.CharScanner;
+import antlr.InputBuffer;
+import antlr.ByteBuffer;
+import antlr.CharBuffer;
+import antlr.Token;
+import antlr.CommonToken;
+import antlr.RecognitionException;
+import antlr.NoViableAltForCharException;
+import antlr.MismatchedCharException;
+import antlr.TokenStream;
+import antlr.ANTLRHashString;
+import antlr.LexerSharedInputState;
+import antlr.collections.impl.BitSet;
+import antlr.SemanticException;

 /** */
-public class EJBQLLexer extends persistence.antlr.CharScanner implements EJBQLTokenTypes, TokenStream
+public class EJBQLLexer extends antlr.CharScanner implements EJBQLTokenTypes, TokenStream
  {
 public EJBQLLexer(InputStream in) {
 	this(new ByteBuffer(in));
diff --git a/src/main/java/oracle/toplink/essentials/internal/parsing/ejbql/antlr273/EJBQLParser.java b/src/main/java/oracle/toplink/essentials/internal/parsing/ejbql/antlr273/EJBQLParser.java
index 9039269..0be902a 100644
--- a/src/main/java/oracle/toplink/essentials/internal/parsing/ejbql/antlr273/EJBQLParser.java
+++ b/src/main/java/oracle/toplink/essentials/internal/parsing/ejbql/antlr273/EJBQLParser.java
@@ -8,19 +8,19 @@
     import static oracle.toplink.essentials.internal.parsing.NodeFactory.*;
     import oracle.toplink.essentials.exceptions.EJBQLException;

-import persistence.antlr.TokenBuffer;
-import persistence.antlr.TokenStreamException;
-import persistence.antlr.TokenStreamIOException;
-import persistence.antlr.ANTLRException;
-import persistence.antlr.LLkParser;
-import persistence.antlr.Token;
-import persistence.antlr.TokenStream;
-import persistence.antlr.RecognitionException;
-import persistence.antlr.NoViableAltException;
-import persistence.antlr.MismatchedTokenException;
-import persistence.antlr.SemanticException;
-import persistence.antlr.ParserSharedInputState;
-import persistence.antlr.collections.impl.BitSet;
+import antlr.TokenBuffer;
+import antlr.TokenStreamException;
+import antlr.TokenStreamIOException;
+import antlr.ANTLRException;
+import antlr.LLkParser;
+import antlr.Token;
+import antlr.TokenStream;
+import antlr.RecognitionException;
+import antlr.NoViableAltException;
+import antlr.MismatchedTokenException;
+import antlr.SemanticException;
+import antlr.ParserSharedInputState;
+import antlr.collections.impl.BitSet;

 /** */
 public class EJBQLParser extends oracle.toplink.essentials.internal.parsing.ejbql.EJBQLParser       implements EJBQLTokenTypes
-- 
2.23.0