Skip to content

Commit bd1f360

Browse files
Upgrade to Spring AI 2, allow concurrent Jackson 2 and 3 (#1283)
* Upgrade Spring AI to 2.0.0-M2 * Update gradle plugins version to accept multiple versions of jackson libraries * Gradle plugins v7.3.1 * Suppress bad CPE match for Spring AI 2.x --------- Co-authored-by: labkey-susanh <susanh@labkey.com>
1 parent 512d94b commit bd1f360

2 files changed

Lines changed: 30 additions & 2 deletions

File tree

dependencyCheckSuppression.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,4 +194,32 @@
194194
<packageUrl regex="true">^pkg:maven/org\.mozilla/rhino@.*$</packageUrl>
195195
<vulnerabilityName>CVE-2025-66453</vulnerabilityName>
196196
</suppress>
197+
198+
<!-- Lots of false positives for Spring AI 2.0 due to bad matches-->
199+
<suppress>
200+
<notes><![CDATA[
201+
file name: spring-ai-autoconfigure-mcp-server-common-2.0.0-M2.jar
202+
]]></notes>
203+
<packageUrl regex="true">^pkg:maven/org\.springframework\.ai/spring-ai-autoconfigure-mcp-server-common@.*$</packageUrl>
204+
<cpe>cpe:/a:vmware:server</cpe>
205+
<cpe>cpe:/a:vmware:vmware_server</cpe>
206+
</suppress>
207+
208+
<suppress>
209+
<notes><![CDATA[
210+
file name: spring-ai-autoconfigure-mcp-server-webmvc-2.0.0-M2.jar
211+
]]></notes>
212+
<packageUrl regex="true">^pkg:maven/org\.springframework\.ai/spring-ai-autoconfigure-mcp-server-webmvc@.*$</packageUrl>
213+
<cpe>cpe:/a:vmware:server</cpe>
214+
<cpe>cpe:/a:vmware:vmware_server</cpe>
215+
</suppress>
216+
217+
<suppress>
218+
<notes><![CDATA[
219+
file name: spring-ai-starter-mcp-server-webmvc-2.0.0-M2.jar
220+
]]></notes>
221+
<packageUrl regex="true">^pkg:maven/org\.springframework\.ai/spring-ai-starter-mcp-server-webmvc@.*$</packageUrl>
222+
<cpe>cpe:/a:vmware:server</cpe>
223+
<cpe>cpe:/a:vmware:vmware_server</cpe>
224+
</suppress>
197225
</suppressions>

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ windowsProteomicsBinariesVersion=1.0
5959
# The current version numbers for the gradle plugins.
6060
artifactoryPluginVersion=5.2.5
6161
gradleNodePluginVersion=7.1.0
62-
gradlePluginsVersion=7.3.0
62+
gradlePluginsVersion=7.3.1
6363
owaspDependencyCheckPluginVersion=12.2.0
6464

6565
# Versions of node and npm to use during the build. If set, these versions
@@ -291,7 +291,7 @@ snappyJavaVersion=1.1.10.8
291291
springBootVersion=4.0.2
292292
# This usually matches the Spring Framework version dictated by springBootVersion
293293
springVersion=7.0.3
294-
springAiVersion=1.1.2
294+
springAiVersion=2.0.0-M2
295295

296296
sqliteJdbcVersion=3.51.1.0
297297

0 commit comments

Comments
 (0)