From e4a7218baa578106a49e89243dfeb3efdd93b7eb Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Thu, 16 Nov 2023 12:50:14 -0600
Subject: [PATCH] Upgrade to Spring Framework 6.0.14.

Resolves #1387.
---
 pom.xml             | 6 +++---
 smoke-tests/pom.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index cb3390a74..9952032a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,15 +116,15 @@
         <smack.version>4.3.5</smack.version>
 
         <!-- Spring Framework/Spring Security baseline -->
-        <spring.version>6.0.12</spring.version> <!-- TODO: Ensure smoke-tests matches -->
+        <spring.version>6.0.14</spring.version> <!-- TODO: Ensure smoke-tests matches, also check spring-next-gen -->
         <spring-security.version>6.0.7</spring-security.version>
 
         <!-- Spring Framework/Spring Security baseline-SNAPSHOT -->
-        <spring-snapshot.version>6.0.13-SNAPSHOT</spring-snapshot.version>
+        <spring-snapshot.version>6.0.15-SNAPSHOT</spring-snapshot.version>
         <spring-security-snapshot.version>6.0.8-SNAPSHOT</spring-security-snapshot.version>
 
         <!-- Spring Framework/Spring Security Next Gen -->
-        <spring-next-gen.version>6.1.0-M5</spring-next-gen.version>
+        <spring-next-gen.version>6.1.0</spring-next-gen.version>
         <spring-security-next-gen.version>6.2.0-M3</spring-security-next-gen.version>
 
         <!-- Spring Framework/Spring Security Next Gen-SNAPSHOT -->
diff --git a/smoke-tests/pom.xml b/smoke-tests/pom.xml
index 5c7cfb4d0..11b325237 100644
--- a/smoke-tests/pom.xml
+++ b/smoke-tests/pom.xml
@@ -19,7 +19,7 @@
 
     <properties>
         <java.version>17</java.version>
-        <spring-framework.version>6.0.12</spring-framework.version>
+        <spring-framework.version>6.0.14</spring-framework.version>
         <stagingRepositoryId>orgspringframework-springws</stagingRepositoryId>
     </properties>