From 4eb7558c8995a7558690e0bed3466e9700cea9dc Mon Sep 17 00:00:00 2001
From: human-user <68408844+human-user@users.noreply.github.com>
Date: Tue, 7 Nov 2023 16:57:13 +0800
Subject: [PATCH 1/2] fix: tokenBlockPattern support \r\n or \r

---
 src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java b/src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java
index febd49a22..a8182344b 100644
--- a/src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java
+++ b/src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java
@@ -214,7 +214,7 @@ public static void main(String[] args) throws Exception {
 
     public static TreeSet<String> getAllKeywordsUsingRegex(File file) throws IOException {
         Pattern tokenBlockPattern = Pattern.compile(
-                "TOKEN\\s*:\\s*(?:/\\*.*\\*/*)\\n\\{(?:[^\\}\\{]+|\\{(?:[^\\}\\{]+|\\{[^\\}\\{]*\\})*\\})*\\}",
+                "TOKEN\\s*:\\s*(?:/\\*.*\\*/*)(?:\\r?\\n|\\r)\\{(?:[^\\}\\{]+|\\{(?:[^\\}\\{]+|\\{[^\\}\\{]*\\})*\\})*\\}",
                 Pattern.MULTILINE);
         Pattern tokenStringValuePattern = Pattern.compile("\\\"(\\w{2,})\\\"", Pattern.MULTILINE);
 

From 9e6b0fa0fb6f0e26aa2d6f9a8351f95ecb4273a2 Mon Sep 17 00:00:00 2001
From: human-user <68408844+human-user@users.noreply.github.com>
Date: Wed, 8 Nov 2023 10:27:03 +0800
Subject: [PATCH 2/2] test: remove nashorn ignore annotation to support jdk11+

---
 .../net/sf/jsqlparser/util/TablesNamesFinderTest.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/java/net/sf/jsqlparser/util/TablesNamesFinderTest.java b/src/test/java/net/sf/jsqlparser/util/TablesNamesFinderTest.java
index 7d122df53..e08c5032c 100644
--- a/src/test/java/net/sf/jsqlparser/util/TablesNamesFinderTest.java
+++ b/src/test/java/net/sf/jsqlparser/util/TablesNamesFinderTest.java
@@ -9,7 +9,6 @@
  */
 package net.sf.jsqlparser.util;
 
-import jdk.nashorn.internal.ir.annotations.Ignore;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.OracleHint;
 import net.sf.jsqlparser.parser.CCJSqlParserManager;
@@ -23,6 +22,7 @@
 import net.sf.jsqlparser.statement.simpleparsing.CCJSqlParserManagerTest;
 import net.sf.jsqlparser.test.TestException;
 import net.sf.jsqlparser.test.TestUtils;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.io.BufferedReader;
@@ -41,17 +41,17 @@ public class TablesNamesFinderTest {
 
     private static final CCJSqlParserManager PARSER_MANAGER = new CCJSqlParserManager();
 
-    @Ignore
+    @Disabled
     public void testRUBiSTableList() throws Exception {
         runTestOnResource("/RUBiS-select-requests.txt");
     }
 
-    @Ignore
+    @Disabled
     public void testMoreComplexExamples() throws Exception {
         runTestOnResource("complex-select-requests.txt");
     }
 
-    @Ignore
+    @Disabled
     public void testComplexMergeExamples() throws Exception {
         runTestOnResource("complex-merge-requests.txt");
     }