Skip to content

[bot] Fast-forward for 25.11.4 #1237

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 3 commits into from
Dec 16, 2025
Merged

[bot] Fast-forward for 25.11.4 #1237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2daa6b
Suppress Rhino complaint for now (#1233)
labkey-adam Dec 11, 2025
cbb0dfc
Merge 25.7 to 25.11
cnathe Dec 15, 2025
7e5e610
Update labkeyVersion to 25.11.4
labkey-teamcity Dec 16, 2025
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 @@ -182,4 +182,16 @@
<packageUrl regex="true">^pkg:maven/org\.itadaki/bzip2@.*$</packageUrl>
<cpe>cpe:/a:bzip2_project:bzip2</cpe>
</suppress>

<!--
Rhino 1.7R3 is getting flagged with a potential DoS issue when toFixed() is called on very small floating point numbers.
Upgrading to a fixed version is not trivial. See https://github.com/LabKey/internal-issues/issues/724 for details.
-->
<suppress>
<notes><![CDATA[
file name: rhino-1.7R3.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.mozilla/rhino@.*$</packageUrl>
<vulnerabilityName>CVE-2025-66453</vulnerabilityName>
</suppress>
</suppressions>
2 changes: 1 addition & 1 deletion 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=25.11.3
labkeyVersion=25.11.4
labkeyClientApiVersion=7.0.0

# Version numbers for the various binary artifacts that are included when
Expand Down