diff --git a/sql/storm-sql-core/pom.xml b/sql/storm-sql-core/pom.xml
index 3625f941240..4d775b10ea2 100644
--- a/sql/storm-sql-core/pom.xml
+++ b/sql/storm-sql-core/pom.xml
@@ -46,7 +46,7 @@
             <email>ricetons@gmail.com</email>
         </developer>
     </developers>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.storm</groupId>
@@ -142,6 +142,16 @@
             <version>4.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.immutables</groupId>
+            <artifactId>value</artifactId>
+            <version>2.9.3</version>
+        </dependency>
     </dependencies>
     <build>
         <sourceDirectory>src/jvm</sourceDirectory>
@@ -266,7 +276,7 @@
                     <dependency>
                         <groupId>org.freemarker</groupId>
                         <artifactId>freemarker</artifactId>
-                        <version>2.3.25-incubating</version>
+                        <version>2.3.31</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -306,7 +316,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>javacc-maven-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.0.1</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
diff --git a/sql/storm-sql-core/src/codegen/data/Parser.tdd b/sql/storm-sql-core/src/codegen/data/Parser.tdd
index 5fc2f201018..496a71c166c 100644
--- a/sql/storm-sql-core/src/codegen/data/Parser.tdd
+++ b/sql/storm-sql-core/src/codegen/data/Parser.tdd
@@ -59,7 +59,15 @@
   dataTypeParserMethods: [
   ]
 
+  # if this list is empty then an empty "()" section is generated and it leads to parsing error in calcite 1.17.0
+  # and higher. Use three keywords arbitrarily chosen to have least impact if removed.
   nonReservedKeywords: [
+    "SPACE",
+    "UPSERT"
+  ]
+
+  nonReservedKeywordsToAdd: [
+    "ALTER"
   ]
 
   createStatementParserMethods: [
@@ -77,12 +85,6 @@
   builtinFunctionCallMethods: [
   ]
 
-  nonReservedKeywordsToAdd: [
-    "userkeyword1",
-    "userkeyword2",
-    "userkeyword3"
-  ]
-
   binaryOperatorsTokens: [
   ]