Skip to content

[bot] Fast-forward for 26.3.16 #1436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
github-actions merged 2 commits into from
Jul 7, 2026
+17 −5
Merged

[bot] Fast-forward for 26.3.16 #1436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fea3fdd
Address OWASP dependency-check CVEs in Jackson and Kotlin (#1428)
labkey-martyp Jul 1, 2026
d535db9
Update labkeyVersion to 26.3.16
labkey-teamcity Jul 7, 2026
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
12 changes: 12 additions & 0 deletions dependencyCheckSuppression.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,4 +316,16 @@
<cve>CVE-2025-15104</cve>
</suppress>

<!--
CVE-2026-53914 is in the Kotlin compiler's build-cache deserialization. We don't compile Kotlin or use the Kotlin build
cache; these jars are only transitive runtime dependencies of OkHttp (via the Duo SDK in mfa, and TCRdb). Not applicable.
-->
<suppress>
<notes><![CDATA[
file names: kotlin-reflect, kotlin-stdlib, kotlin-stdlib-jdk7, kotlin-stdlib-jdk8
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.jetbrains\.kotlin/.*@.*$</packageUrl>
<cve>CVE-2026-53914</cve>
</suppress>

</suppressions>
10 changes: 5 additions & 5 deletions gradle.properties
View file
Open in desktop
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.15
labkeyVersion=26.3.16
labkeyClientApiVersion=7.2.0

# Version numbers for the various binary artifacts that are included when
Expand Down Expand Up @@ -195,15 +195,15 @@ httpcoreVersion=4.4.16
intellijKotlinVersion=2.3.10

# Update the three Jackson dependency versions below in tandem, unless one gets a patch release out-of-sync with the others
jacksonVersion=2.21.0
jacksonDatabindVersion=2.21.0
jacksonJaxrsBaseVersion=2.21.0
jacksonVersion=2.21.4
jacksonDatabindVersion=2.21.4
jacksonJaxrsBaseVersion=2.21.4

# Note the inconsistent version numbering for "annotations"... it no longer matches the above
jacksonAnnotationsVersion=2.21

# Spring Boot brings in a transitive dependency on Jackson 3.x. It has changed package names and can coexist with Jackson 2.x.
jackson3Version=3.1.0
jackson3Version=3.1.4

# The Jakarta Activation API version that Angus Activation implements. Keep in sync with angusActivationVersion (above).
jakartaActivationApiVersion=2.1.4
Expand Down
Loading