Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ buildFromSource=true

# The default version for LabKey artifacts that are built or that we depend on.
# override in an individual module's gradle.properties file as necessary
labkeyVersion=26.3.12
labkeyVersion=26.3.13
labkeyClientApiVersion=7.2.0

# Version numbers for the various binary artifacts that are included when
Expand Down Expand Up @@ -291,10 +291,10 @@ 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
springAiVersion=2.0.0-M8
springVersion=7.0.8
springAiVersion=2.0.0

sqliteJdbcVersion=3.51.1.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ 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);

// 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
Expand Down
Loading