diff --git a/dependencyCheckSuppression.xml b/dependencyCheckSuppression.xml
index b181166d9d..99cd681ac2 100644
--- a/dependencyCheckSuppression.xml
+++ b/dependencyCheckSuppression.xml
@@ -194,4 +194,32 @@
        <packageUrl regex="true">^pkg:maven/org\.mozilla/rhino@.*$</packageUrl>
        <vulnerabilityName>CVE-2025-66453</vulnerabilityName>
     </suppress>
+
+    <!-- Lots of false positives for Spring AI 2.0 due to bad matches-->
+    <suppress>
+        <notes><![CDATA[
+   file name: spring-ai-autoconfigure-mcp-server-common-2.0.0-M2.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework\.ai/spring-ai-autoconfigure-mcp-server-common@.*$</packageUrl>
+        <cpe>cpe:/a:vmware:server</cpe>
+        <cpe>cpe:/a:vmware:vmware_server</cpe>
+    </suppress>
+
+    <suppress>
+        <notes><![CDATA[
+   file name: spring-ai-autoconfigure-mcp-server-webmvc-2.0.0-M2.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework\.ai/spring-ai-autoconfigure-mcp-server-webmvc@.*$</packageUrl>
+        <cpe>cpe:/a:vmware:server</cpe>
+        <cpe>cpe:/a:vmware:vmware_server</cpe>
+    </suppress>
+
+    <suppress>
+        <notes><![CDATA[
+   file name: spring-ai-starter-mcp-server-webmvc-2.0.0-M2.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework\.ai/spring-ai-starter-mcp-server-webmvc@.*$</packageUrl>
+        <cpe>cpe:/a:vmware:server</cpe>
+        <cpe>cpe:/a:vmware:vmware_server</cpe>
+    </suppress>
 </suppressions>
diff --git a/gradle.properties b/gradle.properties
index b866db51a2..860a704842 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -59,7 +59,7 @@ windowsProteomicsBinariesVersion=1.0
 # The current version numbers for the gradle plugins.
 artifactoryPluginVersion=5.2.5
 gradleNodePluginVersion=7.1.0
-gradlePluginsVersion=7.3.0
+gradlePluginsVersion=7.3.1
 owaspDependencyCheckPluginVersion=12.2.0
 
 # Versions of node and npm to use during the build. If set, these versions
@@ -291,7 +291,7 @@ snappyJavaVersion=1.1.10.8
 springBootVersion=4.0.2
 # This usually matches the Spring Framework version dictated by springBootVersion
 springVersion=7.0.3
-springAiVersion=1.1.2
+springAiVersion=2.0.0-M2
 
 sqliteJdbcVersion=3.51.1.0