From c1225f5b4234a66cd12eaad28666a5559123dbe9 Mon Sep 17 00:00:00 2001
From: Steven Tamm <tamm@alum.mit.edu>
Date: Wed, 12 Feb 2025 10:16:20 -0800
Subject: [PATCH 1/2] use maven profiles to control plugin for different JDKs

---
 google-test/pom.xml |  2 +-
 impl/pom.xml        | 76 ++++++++++++++++++++++++++++++++-------------
 mysql-test/pom.xml  |  2 +-
 pom.xml             |  2 +-
 4 files changed, 57 insertions(+), 25 deletions(-)

diff --git a/google-test/pom.xml b/google-test/pom.xml
index dad73cc2..385b880f 100644
--- a/google-test/pom.xml
+++ b/google-test/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>com.salesforce.formula</groupId>
     <artifactId>formula-engine</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.9.3-SNAPSHOT</version>
   </parent>
 
   <properties>
diff --git a/impl/pom.xml b/impl/pom.xml
index 90570e5e..eb9c5ca6 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -98,30 +98,62 @@
 
     </dependencies>
 
+    <!-- Antlr 2 plugin uses security manager -->
+    <profiles>
+      <profile>
+        <id>modernJdk</id>
+        <activation>
+          <jdk>[17,)</jdk>        
+        </activation>
+        <build>
+          <plugins>
+              <plugin>
+                  <groupId>org.omnifaces</groupId>
+                  <artifactId>antlr-maven-plugin</artifactId>
+                  <version>2.4</version>
+                  <configuration>
+                      <grammars>*.g</grammars>
+                  </configuration>
+                  <executions>
+                      <execution>
+                          <goals>
+                              <goal>generate</goal>
+                          </goals>
+                      </execution>
+                  </executions>
+              </plugin> 
+          </plugins>  
+        </build>
+      </profile>    
+      <profile>
+        <id>oldJdk</id>
+        <activation>
+          <jdk>(1.8,17)</jdk>        
+        </activation>
+        <build>
+          <plugins>
+              <plugin>
+                  <groupId>org.codehaus.mojo</groupId>
+                  <artifactId>antlr-maven-plugin</artifactId>
+                  <version>2.4</version>
+                  <configuration>
+                      <grammars>*.g</grammars>
+                  </configuration>
+                  <executions>
+                      <execution>
+                          <goals>
+                              <goal>generate</goal>
+                          </goals>
+                      </execution>
+                  </executions>
+              </plugin> 
+          </plugins> 
+        </build> 
+      </profile>
+    </profiles>
+
     <build>
         <plugins>
-            <plugin>
-            <!--
-            In JDK 17, use
-                <groupId>org.omnifaces</groupId>
-                <artifactId>antlr-maven-plugin</artifactId>
-                <version>2.4</version>
-             -->
-
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>antlr-maven-plugin</artifactId>
-                <version>2.2</version>
-                <configuration>
-                    <grammars>*.g</grammars>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.antlr</groupId>
                 <artifactId>antlr4-maven-plugin</artifactId>
diff --git a/mysql-test/pom.xml b/mysql-test/pom.xml
index 51a1d936..5717c589 100644
--- a/mysql-test/pom.xml
+++ b/mysql-test/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.salesforce.formula</groupId>
     <artifactId>formula-engine</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.9.3-SNAPSHOT</version>
   </parent>
 
   <properties>
diff --git a/pom.xml b/pom.xml
index 69eda3de..f6eba0ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
       <dependency>
         <groupId>com.salesforce.grammaticus</groupId>
         <artifactId>grammaticus</artifactId>
-        <version>1.2.2</version>
+        <version>1.2.31</version>
         <optional>true</optional>
       </dependency>
       <dependency>

From 3115739874cdad0d6dc21b91dd86d8e47ba04bb7 Mon Sep 17 00:00:00 2001
From: Steven Tamm <tamm@alum.mit.edu>
Date: Wed, 12 Feb 2025 11:01:13 -0800
Subject: [PATCH 2/2] use correct version of old plugin

---
 impl/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/impl/pom.xml b/impl/pom.xml
index eb9c5ca6..9a912ab6 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -135,7 +135,7 @@
               <plugin>
                   <groupId>org.codehaus.mojo</groupId>
                   <artifactId>antlr-maven-plugin</artifactId>
-                  <version>2.4</version>
+                  <version>2.2</version>
                   <configuration>
                       <grammars>*.g</grammars>
                   </configuration>