Merge 25.3 to develop

Author: labkey-teamcity

gradle.properties

@@ -288,7 +288,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
 

server/embedded/build.gradle

@@ -46,11 +46,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)