Spring AI version (#1259)

Author: labkey-matthewb

build.gradle

@@ -76,8 +76,10 @@ allprojects {
                 utilities
             }
     configurations.configureEach {
-        // exclude log4j, which may come in transitively, from all configurations to avoid its potential vulnerabilities
+        // exclude log4j 1.x, which may come in transitively, from all configurations to avoid its potential vulnerabilities
         exclude group: "log4j", module:"log4j"
+        // exclude to ensure we don't have Log4J to SLFJ adapters or other unwanted logging libraries added to modules
+        exclude group: "org.springframework.boot", module:"spring-boot-starter-logging"
     }
     configurations.driver.setDescription("Dependencies used for Gradle SetUpProperties task")
     configurations.utilities.setDescription("Utility binaries for use on Windows platform")
@@ -202,6 +204,13 @@ 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}"
+                    // also it pulls in a bunch of com.google.api dependencies which conflict with DiscvrLabKeyModules:SequenceAnalysis and wnprc-modules:WNPRC_EHR
+                    force "com.google.api:api-common:${googleApiVersion}"
+                    force "com.google.auth:google-auth-library-oauth2-http:${googleAuthVersion}"
+                    force "com.google.auth:google-auth-library-credentials:${googleAuthVersion}"
+
                     // 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}"

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
@@ -153,6 +155,8 @@ flyingsaucerVersion=R8
 fopVersion=2.11
 
 # Force latest for consistency
+googleApiVersion=2.47.0
+googleAuthVersion=1.33.0
 googleAutoValueAnnotationsVersion=1.10.4
 googleErrorProneAnnotationsVersion=2.45.0
 googleHttpClientVersion=2.0.2
@@ -288,6 +292,7 @@ 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
 
 sqliteJdbcVersion=3.51.1.0
 

server/embedded/src/org/labkey/embedded/EmbeddedExtractor.java

@@ -276,7 +276,7 @@ public File extractExecutableJar(File destDirectory, boolean distribution, boole
                     }
                     if (remotePipeline)
                     {
-                        // Keep this code in sync with org.labkey.pipeline.api.PipelineServiceImpl.extractBootstrapFromEmbedded()
+                        // Keep this code in sync with org.labkey.pipeline.api.PipelineServiceImpl.getClusterStartupArguments()
                         bootstrapJar = extractIfMatch(bootstrapJar, entry, jar, "labkeyBootstrap", "labkeyBootstrap.jar", destDirectory);
                         servletApiJar = extractIfMatch(servletApiJar, entry, jar, "tomcat-embed-core", "servletApi.jar", pipelineLib);
                         log4JCoreJar = extractIfMatch(log4JCoreJar, entry, jar, "log4j-core", "log4j-core.jar", pipelineLib);