diff --git a/build.gradle b/build.gradle index 1ffa4c81aa..8c7c36b0ed 100644 --- a/build.gradle +++ b/build.gradle @@ -205,6 +205,8 @@ allprojects { resolutionStrategy { // spring-ai pulls a different version of antr-ST4 than the version pulled by query (via antlr) force "org.antlr:ST4:${antlrST4Version}" + // different spring-ai artifacts (e.g. spring-ai-transformers) pull different antlr4-runtime versions than ST4 does + force "org.antlr:antlr4-runtime:${antlr4RuntimeVersion}" // 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}" @@ -393,6 +395,9 @@ allprojects { // Spring AI 2.0 brings in Jackson3. Force it to match embedded and mitigate CVEs. force "tools.jackson.core:jackson-core:${jackson3Version}" + // Spring AI's pgvector-store brings in its own PostgreSQL JDBC driver; force ours + force "org.postgresql:postgresql:${postgresqlDriverVersion}" + dependencySubstitution { // Because the client api artifact name is not the same as the directory structure, we use // Gradle's dependency substitution so the dependency will appear correctly in the pom files that diff --git a/dependencyCheckSuppression.xml b/dependencyCheckSuppression.xml index 4b696b82a5..14751ab133 100644 --- a/dependencyCheckSuppression.xml +++ b/dependencyCheckSuppression.xml @@ -438,4 +438,16 @@ CVE-2025-15104 + + + + ^pkg:maven/org\.jetbrains\.kotlin/.*@.*$ + CVE-2026-53914 + + diff --git a/gradle.properties b/gradle.properties index 36b7e6106d..aa3280faa4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -90,11 +90,12 @@ annotationsVersion=15.0 antVersion=1.10.17 antlrST4Version=4.3.4 +antlr4RuntimeVersion=4.13.2 #Unifying version used by DISCVR and Premium -apacheDirectoryVersion=2.1.7 +apacheDirectoryVersion=2.1.8 #Transitive dependency of Apache directory -apacheMinaVersion=2.2.7 +apacheMinaVersion=2.2.9 # Usually matches the version specified as a Spring Boot dependency (see springBootVersion below) apacheTomcatVersion=11.0.22 @@ -107,7 +108,7 @@ asmVersion=9.10 awsSdkVersion=2.29.50 # Microsoft library for sending OAuth2-authenticated notification emails via the Microsoft Graph API -azureIdentityVersion=1.18.3 +azureIdentityVersion=1.18.4 # Apache Batik -- Batik version needs to be compatible with Apache FOP, but we need to pull in batik-codec separately batikVersion=1.19 @@ -120,7 +121,7 @@ cglibNodepVersion=2.2.3 checkerQualVersion=3.53.0 -commonmarkVersion=0.28.0 +commonmarkVersion=0.29.0 # the beanutils version is not the default version brought from commons-validator and/or commons-digester # in the :server:api module but is required for some of our code to compile @@ -135,14 +136,14 @@ commonsDiscoveryVersion=0.2 commonsIoVersion=2.22.0 commonsLang3Version=3.20.0 commonsLangVersion=2.6 -commonsLoggingVersion=1.3.6 +commonsLoggingVersion=1.4.0 commonsMath3Version=3.6.1 commonsPoolVersion=1.6 commonsTextVersion=1.15.0 commonsValidatorVersion=1.10.1 commonsVfs2Version=2.10.0 -datadogVersion=1.62.0 +datadogVersion=1.63.2 dom4jVersion=2.2.0 @@ -160,13 +161,13 @@ fopVersion=2.11 googleApiVersion=2.47.0 googleAuthVersion=1.40.0 googleAutoValueAnnotationsVersion=1.10.4 -googleErrorProneAnnotationsVersion=2.49.0 -googleHttpClientVersion=2.1.0 +googleErrorProneAnnotationsVersion=2.50.0 +googleHttpClientVersion=2.1.1 googleOauthClientVersion=1.39.0 googleProtocolBufVersion=3.25.9 graphSupportVersion=1.5.2 -grpcVersion=1.81.0 +grpcVersion=1.82.1 # Cloud and SequenceAnalysis bring gson in as a transitive dependency. # We resolve to the later version here to keep things consistent @@ -185,7 +186,7 @@ hamcrestVersion=2.2 htsjdkVersion=4.3.0 httpclient5Version=5.5.2 -httpcore5Version=5.4.2 +httpcore5Version=5.4.3 # Not used directly, but these are widely used transitive dependencies httpclientVersion=4.5.14 @@ -219,7 +220,7 @@ jaxbOldVersion=2.3.3 # All other direct and indirect uses of JAXB use the current, jakarta-packaged versions jaxbApiVersion=4.0.5 -jaxbVersion=4.0.8 +jaxbVersion=4.0.9 jaxrpcVersion=1.1 @@ -252,7 +253,7 @@ log4j2Version=2.26.0 lombokVersion=1.18.46 -luceneVersion=10.4.0 +luceneVersion=10.5.0 # Microsoft library for sending OAuth2-authenticated notification emails via the Microsoft Graph API microsoftGraphVersion=6.65.0 @@ -278,7 +279,7 @@ poiVersion=5.5.1 pollingWatchVersion=0.2.0 -postgresqlDriverVersion=42.7.11 +postgresqlDriverVersion=42.7.12 quartzVersion=2.5.2 @@ -306,7 +307,7 @@ springBootVersion=4.1.0 springVersion=7.0.8 springAiVersion=2.0.0 -sqliteJdbcVersion=3.53.1.0 +sqliteJdbcVersion=3.53.2.0 # SAML brings stax2-api in as a transitive dependency. We force the latest version. stax2ApiVersion=4.2.2