From 8a0b633c97ae372001d7231f50b6122cba9cb333 Mon Sep 17 00:00:00 2001
From: Adam Rauch <adam@labkey.com>
Date: Wed, 2 Apr 2025 16:04:30 -0700
Subject: [PATCH 1/2] Update Google Guava to the latest version

---
 gradle.properties | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 192210ccd1..31ccb34916 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -168,7 +168,7 @@ gsonVersion=2.8.9
 
 grpcVersion=1.71.0
 
-guavaVersion=33.4.0-jre
+guavaVersion=33.4.6-jre
 
 # Note: You won't find usages in the product sources; this property is used by the gradle plugin.
 gwtVersion=2.11.0
@@ -248,12 +248,11 @@ mssqlJdbcVersion=12.10.0.jre11
 
 mysqlDriverVersion=9.2.0
 
-# forced compatibility between docker and UserReg-WS
+# force for docker
 nettyVersion=4.1.119.Final
 
 objenesisVersion=1.0
 
-# increase from 2.0 for remoteclientapi/java
 opencsvVersion=2.3
 
 openTracingVersion=0.33.0

From 67c354f88a7aac98076092ae470329962ab8e056 Mon Sep 17 00:00:00 2001
From: Adam Rauch <adam@labkey.com>
Date: Fri, 4 Apr 2025 07:16:52 -0700
Subject: [PATCH 2/2] Force FindBugs version

---
 build.gradle      | 2 ++
 gradle.properties | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 712a040bee..5a3bf60f2a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -224,6 +224,8 @@ allprojects {
                     force "com.google.guava:guava:${guavaVersion}"
                     // force version for SequenceAnalysis, TargetedMS
                     force "com.google.protobuf:protobuf-java:${googleProtocolBufVersion}"
+                    // force version for Cloud, FileTransfer, SequenceAnalysis, etc.
+                    force "com.google.code.findbugs:jsr305:${jsr305Version}"
                     // force Jakarta Activation API version used by our Angus Activation implementation
                     force "jakarta.activation:jakarta.activation-api:${jakartaActivationApiVersion}"
                     // force version for accounts, api, query
diff --git a/gradle.properties b/gradle.properties
index 9db8291677..69c377b973 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -225,7 +225,7 @@ jmockVersion=2.6.0
 
 jodaTimeVersion=2.14.0
 
-# brought in transitively from guava and other google packages. Need to resolve consistently
+# brought in transitively by Cloud, FileTransfer, SequenceAnalysis, etc. Need to resolve consistently
 jsr305Version=3.0.2
 
 orgJsonVersion=20250107