From 487550919ef454379c17dd2dd2e3b2df64fb60bb Mon Sep 17 00:00:00 2001
From: Adam Rauch <adam@labkey.com>
Date: Wed, 21 May 2025 11:39:48 -0700
Subject: [PATCH] Upgrade Spring Framework to the latest version (#1068)

---
 gradle.properties            |  2 +-
 server/embedded/build.gradle | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index dd2259f713..f708a5f695 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -291,7 +291,7 @@ snappyJavaVersion=1.1.10.7
 # Also, update apacheTomcatVersion above to match Spring Boot's Tomcat dependency version
 springBootVersion=3.4.5
 # This usually matches the Spring Framework version dictated by springBootVersion
-springVersion=6.2.6
+springVersion=6.2.7
 
 sqliteJdbcVersion=3.49.1.0
 
diff --git a/server/embedded/build.gradle b/server/embedded/build.gradle
index 943cf6b021..c3f44c42cf 100644
--- a/server/embedded/build.gradle
+++ b/server/embedded/build.gradle
@@ -43,11 +43,46 @@ dependencies {
     }
 
     // Allows forcing a Spring Framework version that differs from spring-boot's version (e.g., to address CVEs)
+    implementation('org.springframework:spring-aop') {
+        version {
+            strictly "${springVersion}"
+        }
+    }
+    implementation('org.springframework:spring-beans') {
+        version {
+            strictly "${springVersion}"
+        }
+    }
+    implementation('org.springframework:spring-context') {
+        version {
+            strictly "${springVersion}"
+        }
+    }
+    implementation('org.springframework:spring-core') {
+        version {
+            strictly "${springVersion}"
+        }
+    }
+    implementation('org.springframework:spring-expression') {
+        version {
+            strictly "${springVersion}"
+        }
+    }
+    implementation('org.springframework:spring-jcl') {
+        version {
+            strictly "${springVersion}"
+        }
+    }
     implementation('org.springframework:spring-web') {
         version {
             strictly "${springVersion}"
         }
     }
+    implementation('org.springframework:spring-webmvc') {
+        version {
+            strictly "${springVersion}"
+        }
+    }
 
     // Allows forcing a Tomcat version that differs from spring-boot's version (e.g., to address CVEs or regressions,
     // or to test a Tomcat release candidate)