Skip to content

[bot] Merge 26.5 to develop (Conflicts) #1382

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
labkey-klum merged 11 commits into from
May 20, 2026
Merged

[bot] Merge 26.5 to develop (Conflicts) #1382

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8f7c30e
Update Apache Mina & Spring to the latest versions (#1359)
labkey-adam May 1, 2026
dc0d1e5
Update PostgreSQL JDBC driver (#1360)
labkey-adam May 4, 2026
e17e4f1
Upgrade to Spring AI 2.0.0-M5 (#1352)
labkey-adam May 5, 2026
3328364
Merge 26.3 to 26.5
labkey-klum May 5, 2026
bac40d2
Update log4j2 (#1366)
labkey-adam May 7, 2026
f9433f8
Merge 26.3 to 26.5
labkey-teamcity May 12, 2026
3ed8149
Update Spring AI and Tomcat dependencies (#1374)
labkey-adam May 13, 2026
1bd160c
Update Netty (#1376)
labkey-adam May 14, 2026
3422dcc
Merge 26.3 to 26.5
labkey-teamcity May 19, 2026
541b082
Merge 26.5 to develop
labkey-klum May 20, 2026
6f381d5
Merge branch 'develop' into fb_bot_merge_26.5
labkey-klum May 20, 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
8 changes: 4 additions & 4 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ apacheDirectoryVersion=2.1.7
apacheMinaVersion=2.2.7

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

# (mothership) -> json-path -> json-smart -> accessor-smart
# (core) -> graalvm
Expand Down Expand Up @@ -246,7 +246,7 @@ jxlVersion=2.6.3

kaptchaVersion=2.3

log4j2Version=2.25.4
log4j2Version=2.26.0

lombokVersion=1.18.46

Expand All @@ -258,7 +258,7 @@ microsoftGraphVersion=6.59.0
mssqlJdbcVersion=13.4.0.jre11

# Netty - transitive dependency via azure-core-http-netty; force for CVE-2026-33871, CVE-2026-33870
nettyVersion=4.2.12.Final
nettyVersion=4.2.13.Final
# Reactor - transitive dependency via azure-core; force for version consistency across modules
reactorCoreVersion=3.8.1

Expand Down Expand Up @@ -302,7 +302,7 @@ snappyJavaVersion=1.1.10.8
springBootVersion=4.0.6
# This usually matches the Spring Framework version dictated by springBootVersion
springVersion=7.0.7
springAiVersion=2.0.0-M5
springAiVersion=2.0.0-M6

sqliteJdbcVersion=3.53.0.0

Expand Down