From 48f48f75e87038601cd7b75c9e99b3740802864c Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Wed, 10 Jun 2026 17:09:07 -0600 Subject: [PATCH 1/2] Update Spring Boot to 4.1.0 and Spring Framework to 7.0.8 Spring Boot 4.1.0 pins Tomcat 11.0.22, which already matches apacheTomcatVersion, so no Tomcat change is needed. --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1d04cf94c9..9138722aff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -291,9 +291,9 @@ slf4jLog4jApiVersion=2.0.17 snappyJavaVersion=1.1.10.8 # Also, update apacheTomcatVersion above to match Spring Boot's Tomcat dependency version -springBootVersion=4.0.6 +springBootVersion=4.1.0 # This usually matches the Spring Framework version dictated by springBootVersion -springVersion=7.0.7 +springVersion=7.0.8 springAiVersion=2.0.0-M8 sqliteJdbcVersion=3.51.1.0 From ca483d123c28eaf519ea67d2bd92039ee5072a18 Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Thu, 11 Jun 2026 06:52:29 -0600 Subject: [PATCH 2/2] Update LabKeyTomcatServletWebServerFactory.java --- .../labkey/embedded/LabKeyTomcatServletWebServerFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/embedded/src/org/labkey/embedded/LabKeyTomcatServletWebServerFactory.java b/server/embedded/src/org/labkey/embedded/LabKeyTomcatServletWebServerFactory.java index ba31b633ef..2a2efb2da7 100644 --- a/server/embedded/src/org/labkey/embedded/LabKeyTomcatServletWebServerFactory.java +++ b/server/embedded/src/org/labkey/embedded/LabKeyTomcatServletWebServerFactory.java @@ -69,7 +69,7 @@ public LabKeyTomcatServletWebServerFactory(LabKeyServer server) } @Override - protected void prepareContext(Host host, ServletContextInitializer[] initializers) + protected void prepareContext(Host host, ServletContextInitializer[] initializers, TempDirs tempDirs) { // Prevent the Spring Boot webapp from trying to deserialize the LabKey sessions getSettings().getSession().setPersistent(false); @@ -77,7 +77,7 @@ protected void prepareContext(Host host, ServletContextInitializer[] initializer // Don't use Spring Boot's error pages, as we want to render our own setErrorPages(Collections.emptySet()); - super.prepareContext(host, initializers); + super.prepareContext(host, initializers, tempDirs); } @Override