Skip to content

[bot] Merge 26.3 to 26.5 (Conflicts) #1362

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
May 5, 2026
+8 −12
Merged

[bot] Merge 26.3 to 26.5 (Conflicts) #1362

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
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
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
3 changes: 0 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,9 +379,6 @@ allprojects {
force "org.springframework:spring-messaging:${springVersion}"
force "org.springframework:spring-webflux:${springVersion}"

// spring-ai dependency. Force to mitigate a CVE.
force "io.modelcontextprotocol.sdk:mcp:${modelContextProtocolVersion}"

// Force consistency between pipeline's ActiveMQ and cloud's jClouds dependencies
force "javax.annotation:javax.annotation-api:${javaxAnnotationVersion}"

Expand Down
17 changes: 8 additions & 9 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ antlrST4Version=4.3.4

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

# Usually matches the version specified as a Spring Boot dependency (see springBootVersion below)
apacheTomcatVersion=11.0.21
Expand Down Expand Up @@ -259,16 +259,15 @@ luceneVersion=10.4.0
# Microsoft library for sending OAuth2-authenticated notification emails via the Microsoft Graph API
microsoftGraphVersion=6.59.0

# Spring-AI dependency that's showing a CVE
modelContextProtocolVersion=1.1.2

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
# Reactor - transitive dependency via azure-core; force for version consistency across modules
reactorCoreVersion=3.8.1

mssqlJdbcVersion=13.2.1.jre11

objenesisVersion=1.0

opencsvVersion=2.3
Expand All @@ -283,7 +282,7 @@ poiVersion=5.5.1

pollingWatchVersion=0.2.0

postgresqlDriverVersion=42.7.10
postgresqlDriverVersion=42.7.11

quartzVersion=2.5.2

Expand All @@ -306,10 +305,10 @@ slf4jLog4jApiVersion=2.0.17
snappyJavaVersion=1.1.10.8

# Also, update apacheTomcatVersion above to match Spring Boot's Tomcat dependency version
springBootVersion=4.0.5
springBootVersion=4.0.6
# This usually matches the Spring Framework version dictated by springBootVersion
springVersion=7.0.6
springAiVersion=2.0.0-M4
springVersion=7.0.7
springAiVersion=2.0.0-M5

sqliteJdbcVersion=3.53.0.0

Expand Down
Loading