From e34b3e9a9149d831efd1e79c1b25bc7fa6bf1c7e Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Wed, 10 Jun 2026 16:40:02 -0700 Subject: [PATCH 1/3] Update to Spring AI 2.0.0-RC1 (#1412) --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 1d04cf94c9..02a451ad4d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -294,7 +294,7 @@ snappyJavaVersion=1.1.10.8 springBootVersion=4.0.6 # This usually matches the Spring Framework version dictated by springBootVersion springVersion=7.0.7 -springAiVersion=2.0.0-M8 +springAiVersion=2.0.0-RC1 sqliteJdbcVersion=3.51.1.0 From 258a466138db539c44f59ec65b15205e5628d144 Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Thu, 11 Jun 2026 15:00:17 -0600 Subject: [PATCH 2/3] Update Spring Boot to 4.1.0 and Spring Framework to 7.0.8 (#1413) ## Rationale Pick up the latest Spring Boot release for 26.3, along with the Spring Framework 7.0.8 patch version it pins. ## Related Pull Requests - None ## Changes - Bump `springBootVersion` from 4.0.6 to 4.1.0 and `springVersion` from 7.0.7 to 7.0.8 in `gradle.properties`. - Verified Spring Boot 4.1.0 pins Tomcat 11.0.22, which already matches `apacheTomcatVersion`, so no Tomcat bump is needed. --- gradle.properties | 4 ++-- .../labkey/embedded/LabKeyTomcatServletWebServerFactory.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 02a451ad4d..576ad718d6 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-RC1 sqliteJdbcVersion=3.51.1.0 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 From 7fff5ab799b7375ac5d7178c068fcf80ceb6987e Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Fri, 12 Jun 2026 14:16:15 -0700 Subject: [PATCH 3/3] Test the latest Spring AI (#1414) --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 576ad718d6..21f365151f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -294,7 +294,7 @@ snappyJavaVersion=1.1.10.8 springBootVersion=4.1.0 # This usually matches the Spring Framework version dictated by springBootVersion springVersion=7.0.8 -springAiVersion=2.0.0-RC1 +springAiVersion=2.0.0 sqliteJdbcVersion=3.51.1.0