From 1e34ae9429519214cd70bf2daa785acf0803914a Mon Sep 17 00:00:00 2001
From: Adam Rauch <adam@labkey.com>
Date: Wed, 3 Sep 2025 21:19:23 -0700
Subject: [PATCH 1/2] Update dependencies

---
 gradle.properties | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index ee283052f4..8057453101 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -117,12 +117,12 @@ cglibNodepVersion=2.2.3
 
 checkerQualVersion=3.31.0
 
-commonmarkVersion=0.25.0
+commonmarkVersion=0.25.1
 
 # 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
 commonsBeanutilsVersion=1.11.0
-commonsCodecVersion=1.18.0
+commonsCodecVersion=1.19.0
 commonsCollections4Version=4.5.0
 commonsCollectionsVersion=3.2.2
 commonsCompressVersion=1.28.0
@@ -135,11 +135,11 @@ commonsLangVersion=2.6
 commonsLoggingVersion=1.3.5
 commonsMath3Version=3.6.1
 commonsPoolVersion=1.6
-commonsTextVersion=1.13.1
+commonsTextVersion=1.14.0
 commonsValidatorVersion=1.10.0
 commonsVfs2Version=2.10.0
 
-datadogVersion=1.51.2
+datadogVersion=1.52.1
 
 dom4jVersion=2.1.4
 
@@ -156,7 +156,7 @@ fopVersion=2.11
 # Force latest for consistency
 googleAutoValueAnnotationsVersion=1.10.4
 googleErrorProneAnnotationsVersion=2.41.0
-googleHttpClientVersion=1.47.1
+googleHttpClientVersion=2.0.0
 googleOauthClientVersion=1.39.0
 googleProtocolBufVersion=3.25.8
 
@@ -166,7 +166,7 @@ googleProtocolBufVersion=3.25.8
 # "java.lang.NoSuchMethodError: 'void com.google.gson.internal.ConstructorConstructor.<init>(java.util.Map)'" errors
 gsonVersion=2.8.9
 
-grpcVersion=1.73.0
+grpcVersion=1.75.0
 
 guavaVersion=33.4.8-jre
 
@@ -183,7 +183,7 @@ hamcrestVersion=2.2
 htsjdkVersion=4.3.0
 
 httpclient5Version=5.5
-httpcore5Version=5.3.4
+httpcore5Version=5.3.5
 
 # Not used directly, but these are widely used transitive dependencies
 httpclientVersion=4.5.14
@@ -192,10 +192,10 @@ httpcoreVersion=4.4.16
 intellijKotlinVersion=1.9.10
 
 # Update all Jackson dependency versions below in tandem, unless one gets a patch release out-of-sync with the others
-jacksonVersion=2.19.2
-jacksonAnnotationsVersion=2.19.2
-jacksonDatabindVersion=2.19.2
-jacksonJaxrsBaseVersion=2.19.2
+jacksonVersion=2.20.0
+jacksonAnnotationsVersion=2.20
+jacksonDatabindVersion=2.20.0
+jacksonJaxrsBaseVersion=2.20.0
 
 # The Jakarta Activation API version that Angus Activation implements. Keep in sync with angusActivationVersion (above).
 jakartaActivationApiVersion=2.1.3
@@ -230,7 +230,7 @@ jsr305Version=3.0.2
 
 orgJsonVersion=20250517
 
-jsoupVersion=1.21.1
+jsoupVersion=1.21.2
 
 junitVersion=4.13.2
 
@@ -244,10 +244,10 @@ lombokVersion=1.18.38
 
 luceneVersion=9.12.2
 
-mssqlJdbcVersion=12.10.1.jre11
+mssqlJdbcVersion=13.2.0.jre11
 
 # force for docker
-nettyVersion=4.2.3.Final
+nettyVersion=4.2.5.Final
 
 objenesisVersion=1.0
 
@@ -287,7 +287,7 @@ slf4jLog4jApiVersion=2.0.17
 snappyJavaVersion=1.1.10.8
 
 # Also, update apacheTomcatVersion above to match Spring Boot's Tomcat dependency version
-springBootVersion=3.5.4
+springBootVersion=3.5.5
 # This usually matches the Spring Framework version dictated by springBootVersion
 springVersion=6.2.10
 

From 71c553d43d3e4af2e1f57d074de63b74fcdb8d90 Mon Sep 17 00:00:00 2001
From: Adam Rauch <adam@labkey.com>
Date: Thu, 4 Sep 2025 10:56:17 -0700
Subject: [PATCH 2/2] Force byte-buddy version

---
 build.gradle      | 2 ++
 gradle.properties | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/build.gradle b/build.gradle
index 7b67e31e77..e626b3f2fa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -203,6 +203,8 @@ allprojects {
                     force "org.slf4j:slf4j-api:${slf4jLog4jApiVersion}"
                     // force some newer versions than are brought in by mondrian (et al.)
                     force "xerces:xercesImpl:${xercesImplVersion}"
+                    // Microsoft SQL Server JDBC driver and Duo SDK pull in different versions of byte-buddy
+                    force "net.bytebuddy:byte-buddy:${byteBuddyVersion}"
                     force "org.apache.logging.log4j:log4j-core:${log4j2Version}"
                     force "org.apache.logging.log4j:log4j-api:${log4j2Version}"
                     force "org.apache.logging.log4j:log4j-1.2-api:${log4j2Version}"
diff --git a/gradle.properties b/gradle.properties
index 8057453101..d27a568178 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -113,6 +113,8 @@ batikVersion=1.19
 bouncycastlePgpVersion=1.81
 bouncycastleVersion=1.81
 
+byteBuddyVersion=1.17.7
+
 cglibNodepVersion=2.2.3
 
 checkerQualVersion=3.31.0