Skip to content

[bot] Merge 25.3 to 25.7 (Conflicts) #1129

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 15, 2025
Merged

[bot] Merge 25.3 to 25.7 (Conflicts) #1129

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
544bef9
Update a couple dependencies (#1125)
labkey-adam Jul 14, 2025
f1cf895
Merge 25.3 to 25.7
labkey-chrisj Jul 15, 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
22 changes: 22 additions & 0 deletions dependencyCheckSuppression.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,4 +226,26 @@
<packageUrl regex="true">^pkg:maven/org\.postgresql/postgresql@.*$</packageUrl>
<vulnerabilityName>CVE-2025-49146</vulnerabilityName>
</suppress>

<!-- Currently no update is available for the old commons-lang component, so we must suppress. -->
<suppress>
<notes><![CDATA[
file name: commons-lang-2.6.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/commons-lang/commons-lang@.*$</packageUrl>
<vulnerabilityName>CVE-2025-48924</vulnerabilityName>
</suppress>

<!--
GSON is getting flagged for "Connect2id Nimbus JOSE + JWT before 10.0.2 allows a remote attacker
to cause a denial of service via a deeply nested JSON object supplied in a JWT claim set, because of
uncontrolled recursion." Seems like a case of mistaken identity, so suppress it.
-->
<suppress>
<notes><![CDATA[
file name: gson-2.8.9.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/com\.google\.code\.gson/gson@.*$</packageUrl>
<vulnerabilityName>CVE-2025-53864</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 @@ -99,7 +99,7 @@ apacheDirectoryVersion=2.1.7
apacheMinaVersion=2.2.4

# Usually matches the version specified as a Spring Boot dependency (see springBootVersion below)
apacheTomcatVersion=10.1.42
apacheTomcatVersion=10.1.43

# (mothership) -> json-path -> json-smart -> accessor-smart
# (core) -> graalvm
Expand Down