Skip to content

Commit 110c940

Browse files
github-actions[bot]labkey-adamlabkey-klumlabkey-teamcity
authored
[bot] Merge 26.5 to develop (#1364)
* Update Apache Mina & Spring to the latest versions (#1359) * Update PostgreSQL JDBC driver (#1360) * Upgrade to Spring AI 2.0.0-M5 (#1352) * Upgrade to Spring AI 2.0.0-M5 * Bump Spring Framework and Spring Boot as well --------- Co-authored-by: Adam Rauch <adam@labkey.com> Co-authored-by: Lum <klum@labkey.com> Co-authored-by: github-actions <teamcity@labkey.com>
1 parent 6b5ae6a commit 110c940

2 files changed

Lines changed: 8 additions & 12 deletions

File tree

build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,9 +379,6 @@ allprojects {
379379
force "org.springframework:spring-messaging:${springVersion}"
380380
force "org.springframework:spring-webflux:${springVersion}"
381381

382-
// spring-ai dependency. Force to mitigate a CVE.
383-
force "io.modelcontextprotocol.sdk:mcp:${modelContextProtocolVersion}"
384-
385382
// Force consistency between pipeline's ActiveMQ and cloud's jClouds dependencies
386383
force "javax.annotation:javax.annotation-api:${javaxAnnotationVersion}"
387384

gradle.properties

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ antlrST4Version=4.3.4
9393

9494
#Unifying version used by DISCVR and Premium
9595
apacheDirectoryVersion=2.1.7
96-
#Transitive dependency of Apache directory: 2.0.18 contains some regressions
97-
apacheMinaVersion=2.2.5
96+
#Transitive dependency of Apache directory
97+
apacheMinaVersion=2.2.7
9898

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

262-
# Spring-AI dependency that's showing a CVE
263-
modelContextProtocolVersion=1.1.2
264-
265262
mssqlJdbcVersion=13.4.0.jre11
266263

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

269+
mssqlJdbcVersion=13.2.1.jre11
270+
272271
objenesisVersion=1.0
273272

274273
opencsvVersion=2.3
@@ -283,7 +282,7 @@ poiVersion=5.5.1
283282

284283
pollingWatchVersion=0.2.0
285284

286-
postgresqlDriverVersion=42.7.10
285+
postgresqlDriverVersion=42.7.11
287286

288287
quartzVersion=2.5.2
289288

@@ -306,10 +305,10 @@ slf4jLog4jApiVersion=2.0.17
306305
snappyJavaVersion=1.1.10.8
307306

308307
# Also, update apacheTomcatVersion above to match Spring Boot's Tomcat dependency version
309-
springBootVersion=4.0.5
308+
springBootVersion=4.0.6
310309
# This usually matches the Spring Framework version dictated by springBootVersion
311-
springVersion=7.0.6
312-
springAiVersion=2.0.0-M4
310+
springVersion=7.0.7
311+
springAiVersion=2.0.0-M5
313312

314313
sqliteJdbcVersion=3.53.0.0
315314

0 commit comments

Comments
 (0)