From e75c9c9a73a30951b2064810592ab732c5624069 Mon Sep 17 00:00:00 2001
From: David B Malkovsky <david@malkovsky.org>
Date: Wed, 25 Jan 2023 06:28:17 -0500
Subject: [PATCH] Upgrade to Spring Framework 6.0.4 (#3582)

---
 distro/src/notice.txt | 32 ++++++++++++++++----------------
 pom.xml               |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/distro/src/notice.txt b/distro/src/notice.txt
index 4a6add994c3..f12fb6c24fa 100644
--- a/distro/src/notice.txt
+++ b/distro/src/notice.txt
@@ -111,22 +111,22 @@ org.mvel                        mvel2                       2.2.6.Final     The
 org.slf4j                       jcl-over-slf4j              1.7.36          MIT License
 org.slf4j                       slf4j-api                   1.7.36          MIT License
 org.slf4j                       slf4j-log4j12               1.7.36          MIT License
-org.springframework             spring-beans                5.3.24          The Apache Software License, Version 2.0
-org.springframework             spring-core                 5.3.24          The Apache Software License, Version 2.0
-org.springframework             spring-context              5.3.24          The Apache Software License, Version 2.0
-org.springframework             spring-context-support      5.3.24          The Apache Software License, Version 2.0
-org.springframework             spring-jdbc                 5.3.24          The Apache Software License, Version 2.0
-org.springframework             spring-tx                   5.3.24          The Apache Software License, Version 2.0
-org.springframework             spring-web                  5.3.24          The Apache Software License, Version 2.0
-org.springframework             spring-webmvc               5.3.24          The Apache Software License, Version 2.0
-org.springframework             spring-aop                  5.3.24          The Apache Software License, Version 2.0
-org.springframework             spring-core                 5.3.24          The Apache Software License, Version 2.0
-org.springframework             spring-expression           5.3.24          The Apache Software License, Version 2.0
-org.springframework             spring-orm                  5.3.24          The Apache Software License, Version 2.0
-org.springframework.security    spring-security-config      5.8.1           The Apache Software License, Version 2.0
-org.springframework.security    spring-security-core        5.8.1           The Apache Software License, Version 2.0
-org.springframework.security    spring-security-crypto      5.8.1           The Apache Software License, Version 2.0
-org.springframework.security    spring-security-web         5.8.1           The Apache Software License, Version 2.0
+org.springframework             spring-beans                6.0.4          The Apache Software License, Version 2.0
+org.springframework             spring-core                 6.0.4          The Apache Software License, Version 2.0
+org.springframework             spring-context              6.0.4          The Apache Software License, Version 2.0
+org.springframework             spring-context-support      6.0.4          The Apache Software License, Version 2.0
+org.springframework             spring-jdbc                 6.0.4          The Apache Software License, Version 2.0
+org.springframework             spring-tx                   6.0.4          The Apache Software License, Version 2.0
+org.springframework             spring-web                  6.0.4          The Apache Software License, Version 2.0
+org.springframework             spring-webmvc               6.0.4          The Apache Software License, Version 2.0
+org.springframework             spring-aop                  6.0.4          The Apache Software License, Version 2.0
+org.springframework             spring-core                 6.0.4          The Apache Software License, Version 2.0
+org.springframework             spring-expression           6.0.4          The Apache Software License, Version 2.0
+org.springframework             spring-orm                  6.0.4          The Apache Software License, Version 2.0
+org.springframework.security    spring-security-config      6.0.1           The Apache Software License, Version 2.0
+org.springframework.security    spring-security-core        6.0.1           The Apache Software License, Version 2.0
+org.springframework.security    spring-security-crypto      6.0.1           The Apache Software License, Version 2.0
+org.springframework.security    spring-security-web         6.0.1           The Apache Software License, Version 2.0
 org.tinyjee.jgraphx             jgraphx                     1.10.4.1        JGraph Ltd - 3 clause BSD license
 org.yaml                        snakeyaml                   1.17            The Apache Software License, Version 2.0
 xerces                          xercesImpl                  2.12.1          The Apache Software License, Version 2.0
diff --git a/pom.xml b/pom.xml
index 83e889e739b..84da7a95178 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 		<jdk.version>17</jdk.version>
 		<!-- When updating one spring version, make sure that all of them are updated to their latest compatible versions -->
 		<spring.boot.version>3.0.1</spring.boot.version>
-		<spring.framework.version>6.0.3</spring.framework.version>
+		<spring.framework.version>6.0.4</spring.framework.version>
 		<spring.security.version>6.0.1</spring.security.version>
 		<spring.amqp.version>3.0.0</spring.amqp.version>
 		<spring.kafka.version>3.0.1</spring.kafka.version>