diff --git a/build.gradle b/build.gradle
index 427a882106..fd61630af4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -202,6 +202,8 @@ allprojects {
     configurations.configureEach
             {Configuration config ->
                 resolutionStrategy {
+                    //  spring-ai pulls a different version of antr-ST4 than the version pulled by query (via antlr)
+                    force "org.antlr:ST4:${antlrST4Version}"
                     // we force this version because we have compilation problems with version 1.9.2 of commons-beanutils, which is the version
                     // that is brought in by Gradle's conflict resolution as a result of our chosen versions for commons-validator (1.5.0) and commons-digester (1.8.1)
                     force "commons-beanutils:commons-beanutils:${commonsBeanutilsVersion}"
diff --git a/gradle.properties b/gradle.properties
index 06ab5786ec..ee3637a502 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -92,6 +92,8 @@ annotationsVersion=15.0
 
 antVersion=1.10.13
 
+antlrST4Version=4.3.4
+
 #Unifying version used by DISCVR and Premium
 apacheDirectoryVersion=2.1.7
 #Transitive dependency of Apache directory: 2.0.18 contains some regressions
@@ -288,6 +290,8 @@ snappyJavaVersion=1.1.10.8
 springBootVersion=4.0.1
 # This usually matches the Spring Framework version dictated by springBootVersion
 springVersion=7.0.2
+springAiVersion=1.1.2
+# springAiVersion=2.0.0-M1
 
 sqliteJdbcVersion=3.51.1.0