diff --git a/gradle.properties b/gradle.properties
index 1673005529..69a6695176 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -283,12 +283,12 @@ slf4jLog4jApiVersion=2.0.9
 # This is a dependency for HTSJDK. Force version for CVE-2023-43642
 snappyJavaVersion=1.1.10.5
 
-springBootVersion=3.1.7
+springBootVersion=3.2.2
 # This usually matches the Tomcat version dictated by springBootVersion
 # Also, keep this in sync with apacheTomcatVersion above
 springBootTomcatVersion=10.1.18
 
-springVersion=6.0.16
+springVersion=6.1.3
 
 # Do not upgrade until BaseDaoImpl stops calling getGeneratedKeys()
 sqliteJdbcVersion=3.42.0.1
diff --git a/server/embedded/src/org/labkey/embedded/LabKeyServer.java b/server/embedded/src/org/labkey/embedded/LabKeyServer.java
index d5ff140dab..04d2f8b309 100644
--- a/server/embedded/src/org/labkey/embedded/LabKeyServer.java
+++ b/server/embedded/src/org/labkey/embedded/LabKeyServer.java
@@ -4,6 +4,8 @@
 import org.apache.catalina.loader.WebappLoader;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.valves.JsonAccessLogValve;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.tomcat.util.descriptor.web.ContextResource;
 import org.apache.tomcat.util.descriptor.web.FilterDef;
 import org.apache.tomcat.util.descriptor.web.FilterMap;
@@ -37,6 +39,8 @@
 @SpringBootApplication
 public class LabKeyServer
 {
+    private static final Log LOG = LogFactory.getLog(LabKeyServer.class);
+
     private static final int BUFFER_SIZE = 4096;
     private static final String TERMINATE_ON_STARTUP_FAILURE = "terminateOnStartupFailure";
     private static final String SERVER_GUID = "serverGUID";
@@ -315,12 +319,12 @@ private String getPropValue(Map<Integer, String> propValues, Integer resourceKey
             {
                 if (propValues == null)
                 {
-                    logger.debug(String.format("%1$s property was not provided, using default", propName));
+                    LOG.debug(String.format("%1$s property was not provided, using default", propName));
                     return defaultValue;
                 }
 
                 if (!propValues.containsKey(resourceKey))
-                    logger.debug(String.format("%1$s property was not provided for resource [%2$s], using default [%3$s]", propName, resourceKey, defaultValue));
+                    LOG.debug(String.format("%1$s property was not provided for resource [%2$s], using default [%3$s]", propName, resourceKey, defaultValue));
 
                 String val = propValues.getOrDefault(resourceKey, defaultValue);
                 return val != null && !val.isBlank() ? val.trim() : defaultValue;