Repository navigation
Simplify embedded Tomcat configuration - #1953
Merged
Merged
Conversation
This was referenced Oct 23, 2026
labkey-adam
approved these changes
Oct 23, 2026
labkey-jeckels
added a commit
to LabKey/platform
that referenced
this pull request
Oct 26, 2026
## Rationale Adapt platform to the simplified embedded Tomcat boot layer by dropping its remaining dependence on standalone-Tomcat system properties. ## Related Pull Requests - LabKey/server#1539 - LabKey/premiumModules#818 - LabKey/onprcEHRModules#1953 ## Changes - Startup environment setup (headless AWT, log directory) uses the shared bootstrap helpers instead of duplicated code keyed off `catalina.base` - The remote pipeline finds `labkeyBootstrap.jar` under `labkey.home` instead of `catalina.home` - Secondary authentication providers share one check for the `context.bypass2FA` setting --------- Co-authored-by: Adam Rauch <adam@labkey.com>
labkey-jeckels
added a commit
to LabKey/server
that referenced
this pull request
Oct 26, 2026
## Rationale Simplify the embedded Tomcat boot layer by moving its static defaults out of Java code and replacing hand-written configuration beans with immutable property records, so configuration is easier to read, override, and log safely. ## Related Pull Requests - LabKey/platform#8222 - LabKey/premiumModules#818 - LabKey/onprcEHRModules#1953 ## Changes - Static server defaults (Tomcat limits, compression, access logs, CSP templates, TLS ciphers, SMTP timeouts) now live in a bundled properties file loaded beneath every other property source, so admins can override any of them and `spring.config.location` can't drop them - Boot configuration binds into immutable records whose logged form masks secrets - Depend on Spring Boot's Tomcat starter instead of the web starter, dropping Spring MVC from the boot layer - Startup settings shared by the boot layer and the webapp (headless AWT, `labkey.home`, the 2FA bypass parameter) are defined in one place - Remote pipeline jars extract into `labkey.home` rather than the working directory - Remove the boot classpath duplicate check, which ignored versions and so couldn't catch the AWS SDK skew it was meant for - The boot layer's AWS SDK now also serves cloudServices
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Rationale
Stop the SLA module from reading
catalina.home, which the simplified embedded Tomcat boot layer no longer relies on.Related Pull Requests
Changes