Skip to content

[bot] Fast-forward for 24.11.1 #936

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 4 commits into from
Nov 26, 2024
Merged

[bot] Fast-forward for 24.11.1 #936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15ebb30
Update netty-common to 4.1.115.Final (#927)
labkey-tchad Nov 18, 2024
aec0270
Ignore CVE false-positive for spring-web 6.1.14 (#928)
labkey-tchad Nov 19, 2024
76738e3
Update dependencies: spring-boot and tomcat (#932)
labkey-tchad Nov 23, 2024
5c249f4
Update labkeyVersion to 24.11.1
labkey-teamcity Nov 26, 2024
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,5 +369,14 @@
</suppress>
<!-- end of glassfish false positive suppressions -->

<!-- False positive. Only 5.3.0 - 5.3.41 are affected:
https://spring.io/security/cve-2024-38828 -->
<suppress>
<notes><![CDATA[
file name: spring-web-6.1.14.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.springframework/spring-web@.*$</packageUrl>
<vulnerabilityName>CVE-2024-38828</vulnerabilityName>
</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=24.11.0
labkeyVersion=24.11.1
labkeyClientApiVersion=6.2.0

# Version numbers for the various binary artifacts that are included when
Expand Down Expand Up @@ -100,7 +100,7 @@ apacheDirectoryVersion=2.1.3
apacheMinaVersion=2.2.1

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

# (mothership) -> json-path -> json-smart -> accessor-smart
# (core) -> graalvm
Expand Down Expand Up @@ -246,7 +246,7 @@ mssqlJdbcVersion=12.8.1.jre11
mysqlDriverVersion=9.1.0

# forced compatibility between docker and UserReg-WS
nettyVersion=4.1.114.Final
nettyVersion=4.1.115.Final

objenesisVersion=1.0

Expand Down Expand Up @@ -288,9 +288,9 @@ slf4jLog4jApiVersion=2.0.16
snappyJavaVersion=1.1.10.7

# Also, update apacheTomcatVersion above to match Spring Boot's Tomcat dependency version
springBootVersion=3.3.5
springBootVersion=3.3.6
# This usually matches the Spring Framework version dictated by springBootVersion
springVersion=6.1.14
springVersion=6.1.15

sqliteJdbcVersion=3.47.0.0

Expand Down