diff --git a/gradle.properties b/gradle.properties index 696d65f97e..801faed103 100644 --- a/gradle.properties +++ b/gradle.properties @@ -301,10 +301,10 @@ slf4jLog4jApiVersion=2.0.18 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 -springAiVersion=2.0.0-M8 +springVersion=7.0.8 +springAiVersion=2.0.0 sqliteJdbcVersion=3.53.1.0 diff --git a/server/embedded/src/org/labkey/embedded/LabKeyTomcatServletWebServerFactory.java b/server/embedded/src/org/labkey/embedded/LabKeyTomcatServletWebServerFactory.java index e5ca6b17ed..8eb8942e16 100644 --- a/server/embedded/src/org/labkey/embedded/LabKeyTomcatServletWebServerFactory.java +++ b/server/embedded/src/org/labkey/embedded/LabKeyTomcatServletWebServerFactory.java @@ -84,7 +84,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); @@ -92,7 +92,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