Skip to content
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.

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

[bot] Fast-forward for 24.11.4 #963

Merged
merged 2 commits into from
Jan 9, 2025
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
9 changes: 9 additions & 0 deletions dependencyCheckSuppression.xml
Original file line number Diff line number Diff line change
Expand Up @@ -378,5 +378,14 @@
<packageUrl regex="true">^pkg:maven/org\.springframework/spring-web@.*$</packageUrl>
<vulnerabilityName>CVE-2024-38828</vulnerabilityName>
</suppress>

<!-- We don't use the sun.io.useCanonCaches setting referenced by this CVE. -->
<suppress>
<notes><![CDATA[
file name: tomcat-catalina-10.1.34.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.apache\.tomcat/tomcat-catalina@.*$</packageUrl>
<vulnerabilityName>CVE-2024-56337</vulnerabilityName>
</suppress>
</suppressions>

6 changes: 3 additions & 3 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=24.11.3
labkeyVersion=24.11.4
labkeyClientApiVersion=6.2.0

# Version numbers for the various binary artifacts that are included when
Expand Down Expand Up @@ -95,9 +95,9 @@ annotationsVersion=15.0
antVersion=1.10.13

#Unifying version used by DISCVR and Premium
apacheDirectoryVersion=2.1.3
apacheDirectoryVersion=2.1.7
#Transitive dependency of Apache directory: 2.0.18 contains some regressions
apacheMinaVersion=2.2.1
apacheMinaVersion=2.2.4

# Usually matches the version specified as a Spring Boot dependency (see springBootVersion below)
apacheTomcatVersion=10.1.34
Expand Down
Loading