From e43ee589339cfcec6082e360d0af206759aa2bc8 Mon Sep 17 00:00:00 2001
From: dbm <david@malkovsky.org>
Date: Thu, 20 Jul 2023 13:23:09 -0400
Subject: [PATCH] Upgrade to Spring Boot 3.1.2 and updated dependencies

---
 distro/src/notice.txt | 36 ++++++++++++++++++------------------
 pom.xml               | 14 +++++++-------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/distro/src/notice.txt b/distro/src/notice.txt
index 9b406e54522..c011bfdf6ee 100644
--- a/distro/src/notice.txt
+++ b/distro/src/notice.txt
@@ -100,8 +100,8 @@ org.apache.httpcomponents       httpclient                  4.5.13          Apac
 org.apache.httpcomponents       httpcore                    4.4.15          Apache License, Version 2.0
 org.apache.httpcomponents       httpmime                    4.5.13          Apache License, Version 2.0
 org.apache.geronimo.bundles     json                        20090211_1      The Apache Software License, Version 2.0
-org.apache.groovy               groovy                      4.0.10          The Apache Software License, Version 2.0
-org.apache.groovy               groovy-jsr223               4.0.12          The Apache Software License, Version 2.0
+org.apache.groovy               groovy                      4.0.13          The Apache Software License, Version 2.0
+org.apache.groovy               groovy-jsr223               4.0.13          The Apache Software License, Version 2.0
 org.liquibase                   liquibase-core              4.5.0           Apache License, Version 2.0
 org.mybatis                     mybatis                     3.5.11          The Apache Software License, Version 2.0
 org.mybatis                     mybatis-spring              3.0.0           The Apache Software License, Version 2.0
@@ -109,22 +109,22 @@ org.mvel                        mvel2                       2.2.6.Final     The
 org.slf4j                       jcl-over-slf4j              2.0.7           MIT License
 org.slf4j                       slf4j-api                   2.0.7           MIT License
 org.slf4j                       slf4j-log4j12               2.0.7           MIT License
-org.springframework             spring-beans                6.0.10           The Apache Software License, Version 2.0
-org.springframework             spring-core                 6.0.10           The Apache Software License, Version 2.0
-org.springframework             spring-context              6.0.10           The Apache Software License, Version 2.0
-org.springframework             spring-context-support      6.0.10           The Apache Software License, Version 2.0
-org.springframework             spring-jdbc                 6.0.10           The Apache Software License, Version 2.0
-org.springframework             spring-tx                   6.0.10           The Apache Software License, Version 2.0
-org.springframework             spring-web                  6.0.10           The Apache Software License, Version 2.0
-org.springframework             spring-webmvc               6.0.10           The Apache Software License, Version 2.0
-org.springframework             spring-aop                  6.0.10           The Apache Software License, Version 2.0
-org.springframework             spring-core                 6.0.10           The Apache Software License, Version 2.0
-org.springframework             spring-expression           6.0.10           The Apache Software License, Version 2.0
-org.springframework             spring-orm                  6.0.10           The Apache Software License, Version 2.0
-org.springframework.security    spring-security-config      6.1.1           The Apache Software License, Version 2.0
-org.springframework.security    spring-security-core        6.1.1           The Apache Software License, Version 2.0
-org.springframework.security    spring-security-crypto      6.1.1           The Apache Software License, Version 2.0
-org.springframework.security    spring-security-web         6.1.1           The Apache Software License, Version 2.0
+org.springframework             spring-beans                6.0.11           The Apache Software License, Version 2.0
+org.springframework             spring-core                 6.0.11           The Apache Software License, Version 2.0
+org.springframework             spring-context              6.0.11           The Apache Software License, Version 2.0
+org.springframework             spring-context-support      6.0.11           The Apache Software License, Version 2.0
+org.springframework             spring-jdbc                 6.0.11           The Apache Software License, Version 2.0
+org.springframework             spring-tx                   6.0.11           The Apache Software License, Version 2.0
+org.springframework             spring-web                  6.0.11           The Apache Software License, Version 2.0
+org.springframework             spring-webmvc               6.0.11           The Apache Software License, Version 2.0
+org.springframework             spring-aop                  6.0.11           The Apache Software License, Version 2.0
+org.springframework             spring-core                 6.0.11           The Apache Software License, Version 2.0
+org.springframework             spring-expression           6.0.11           The Apache Software License, Version 2.0
+org.springframework             spring-orm                  6.0.11           The Apache Software License, Version 2.0
+org.springframework.security    spring-security-config      6.1.2           The Apache Software License, Version 2.0
+org.springframework.security    spring-security-core        6.1.2           The Apache Software License, Version 2.0
+org.springframework.security    spring-security-crypto      6.1.2           The Apache Software License, Version 2.0
+org.springframework.security    spring-security-web         6.1.2           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 0885943879f..e2205c5ad15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,18 +14,18 @@
 		<distributionManagementSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</distributionManagementSnapshotsUrl>
 		<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.1.1</spring.boot.version>
-		<spring.framework.version>6.0.10</spring.framework.version>
-		<spring.security.version>6.1.1</spring.security.version>
+		<spring.boot.version>3.1.2</spring.boot.version>
+		<spring.framework.version>6.0.11</spring.framework.version>
+		<spring.security.version>6.1.2</spring.security.version>
 		<spring.amqp.version>3.0.5</spring.amqp.version>
-		<spring.kafka.version>3.0.8</spring.kafka.version>
+		<spring.kafka.version>3.0.9</spring.kafka.version>
 		<reactor-netty.version>1.1.8</reactor-netty.version>
 		<jackson.version>2.15.2</jackson.version>
 		<jakarta-jms.version>3.1.0</jakarta-jms.version>
         <camel.version>4.0.0-RC1</camel.version>
 		<cxf.version>4.0.2</cxf.version>
 		<slf4j.version>2.0.7</slf4j.version>
-		<groovy.version>4.0.12</groovy.version>
+		<groovy.version>4.0.13</groovy.version>
 		<jib-maven-plugin.version>3.3.1</jib-maven-plugin.version>
 
 		<junit.version>4.13.2</junit.version>
@@ -275,7 +275,7 @@
 			<dependency>
 				<groupId>org.hibernate.orm</groupId>
 				<artifactId>hibernate-core</artifactId>
-				<version>6.1.5.Final</version>
+				<version>6.2.6.Final</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.groovy</groupId>
@@ -389,7 +389,7 @@
 			<dependency>
 				<groupId>org.hsqldb</groupId>
 				<artifactId>hsqldb</artifactId>
-				<version>2.7.1</version>
+				<version>2.7.2</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>