From f080897afd8e60db53717e39d824162be5434293 Mon Sep 17 00:00:00 2001
From: Emilie <emilie.robichaud@bnymellon.com>
Date: Mon, 10 Feb 2025 19:40:14 -0500
Subject: [PATCH] Upgrade dependencies

---
 spring-boot-with-admin/admin/pom.xml        | 19 ++++++++++++----
 spring-boot-with-admin/notification/pom.xml |  9 +++++---
 spring-boot-with-admin/registry/pom.xml     | 24 +++++++++++++++++++--
 spring-boot/todo/pom.xml                    | 17 +++++++++++----
 spring-framework/ch08_spring-rest/pom.xml   |  6 +++++-
 spring-framework/pom.xml                    | 15 ++++++++-----
 6 files changed, 71 insertions(+), 19 deletions(-)

diff --git a/spring-boot-with-admin/admin/pom.xml b/spring-boot-with-admin/admin/pom.xml
index 1b7ab41..32d7c28 100644
--- a/spring-boot-with-admin/admin/pom.xml
+++ b/spring-boot-with-admin/admin/pom.xml
@@ -35,8 +35,9 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
 
-        <spring-boot-admin.version>2.6.7</spring-boot-admin.version>
-        <spring-cloud.version>3.1.2</spring-cloud.version>
+        <spring-boot-admin.version>3.4.1</spring-boot-admin.version>
+        <spring-cloud-starter-client.version>4.2.0</spring-cloud-starter-client.version>
+        <spring-starter-parent.version>3.4.1</spring-starter-parent.version>
     </properties>
 
     <dependencyManagement>
@@ -44,10 +45,20 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-parent</artifactId>
-                <version>2.6.7</version>
+                <version>${spring-starter-parent.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>com.thoughtworks.xstream</groupId>
+                <artifactId>xstream</artifactId>
+                <version>1.4.21</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>4.5.14</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -83,7 +94,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-            <version>${spring-cloud.version}</version>
+            <version>${spring-cloud-starter-client.version}</version>
         </dependency>
         <!-- Testing -->
         <dependency>
diff --git a/spring-boot-with-admin/notification/pom.xml b/spring-boot-with-admin/notification/pom.xml
index c526180..2b2af67 100644
--- a/spring-boot-with-admin/notification/pom.xml
+++ b/spring-boot-with-admin/notification/pom.xml
@@ -36,8 +36,11 @@
 		<maven.compiler.target>11</maven.compiler.target>
 
 		<log4j2.version>2.17.1</log4j2.version>
-		<spring-cloud.version>2021.0.0</spring-cloud.version>
-		<swagger2.version>2.6.0</swagger2.version>
+
+		<swagger2.version>3.0.0</swagger2.version>
+
+		<spring-cloud.version>2024.0.0</spring-cloud.version>
+		<spring-starter-parent.version>3.4.1</spring-starter-parent.version>
 	</properties>
 
 	<dependencyManagement>
@@ -52,7 +55,7 @@
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter-parent</artifactId>
-				<version>2.6.3</version>
+				<version>${spring-starter-parent.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/spring-boot-with-admin/registry/pom.xml b/spring-boot-with-admin/registry/pom.xml
index ea63b86..ca55e8f 100644
--- a/spring-boot-with-admin/registry/pom.xml
+++ b/spring-boot-with-admin/registry/pom.xml
@@ -35,7 +35,10 @@
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
 
-		<spring-cloud.version>2021.0.0</spring-cloud.version>
+		<spring-cloud.version>2024.0.0</spring-cloud.version>
+		<spring-starter-test.version>3.4.1</spring-starter-test.version>
+		<spring-cloud-starter-server.version>4.2.0</spring-cloud-starter-server.version>
+		<spring-cloud-starter-parent.version>3.4.1</spring-cloud-starter-parent.version>
 	</properties>
 
 	<dependencyManagement>
@@ -43,7 +46,7 @@
             <dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter-parent</artifactId>
-				<version>2.6.3</version>
+				<version>${spring-cloud-starter-parent.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -54,6 +57,21 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>com.thoughtworks.xstream</groupId>
+				<artifactId>xstream</artifactId>
+				<version>1.4.21</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.httpcomponents</groupId>
+				<artifactId>httpclient</artifactId>
+				<version>4.5.14</version>
+			</dependency>
+			<dependency>
+				<groupId>ch.qos.logback</groupId>
+				<artifactId>logback-core</artifactId>
+				<version>1.5.16</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<dependencies>
@@ -61,10 +79,12 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
+			<version>${spring-cloud-starter-server.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
+			<version>${spring-starter-test.version}</version>
 			<scope>test</scope>
 		</dependency>
     </dependencies>
diff --git a/spring-boot/todo/pom.xml b/spring-boot/todo/pom.xml
index 3ce9858..820720c 100644
--- a/spring-boot/todo/pom.xml
+++ b/spring-boot/todo/pom.xml
@@ -39,12 +39,15 @@
         <logback-core.version>1.1.7</logback-core.version>
         <commons-lang3.version>3.11</commons-lang3.version>
 
-        <swagger2.version>2.6.0</swagger2.version>
+        <swagger2.version>3.0.0</swagger2.version>
 
         <jackson.version>2.21.1</jackson.version>
 
-        <dbunit.version>2.7.0</dbunit.version>
+        <dbunit.version>3.0.0</dbunit.version>
+
         <spring-test-dbunit.version>1.3.0</spring-test-dbunit.version>
+        <spring-starter-web.version>3.4.1</spring-starter-web.version>
+        <spring-starter-parent.version>3.4.1</spring-starter-parent.version>
 
         <rest-assured.version>3.0.3</rest-assured.version>
     </properties>
@@ -61,10 +64,15 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-parent</artifactId>
-                <version>2.4.2</version>
+                <version>${spring-starter-parent.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>io.github.classgraph</groupId>
+                <artifactId>classgraph</artifactId>
+                <version>4.8.179</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -84,6 +92,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <version>${spring-starter-web.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
@@ -163,7 +172,7 @@
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
-            <version>4.3.3</version>
+            <version>5.5.0</version>
         </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
diff --git a/spring-framework/ch08_spring-rest/pom.xml b/spring-framework/ch08_spring-rest/pom.xml
index 5db3893..95ad5bc 100644
--- a/spring-framework/ch08_spring-rest/pom.xml
+++ b/spring-framework/ch08_spring-rest/pom.xml
@@ -47,7 +47,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-
+            <dependency>
+                <groupId>io.github.classgraph</groupId>
+                <artifactId>classgraph</artifactId>
+                <version>4.8.179</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/spring-framework/pom.xml b/spring-framework/pom.xml
index 6c8e3ca..c8f9a51 100644
--- a/spring-framework/pom.xml
+++ b/spring-framework/pom.xml
@@ -38,21 +38,21 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
 
-        <spring-framework.version>6.0.8</spring-framework.version>
+        <spring-framework.version>6.1.14</spring-framework.version>
         <spring-data.jpa>3.0.5</spring-data.jpa>
 
         <junit5.version>5.9.3</junit5.version>
 
-        <logback.version>1.4.6</logback.version>
+        <logback.version>1.5.16</logback.version>
 
-        <h2-database.version>2.1.214</h2-database.version>
+        <h2-database.version>2.3.232</h2-database.version>
         <hibernate.version>6.1.7.Final</hibernate.version>
         <jcl-over-slf4j.version>2.0.5</jcl-over-slf4j.version>
 
-        <jackson.version>2.4.0</jackson.version>
+        <jackson.version>2.13.4.2</jackson.version>
         <jaxb-api.version>4.0.0</jaxb-api.version>
 
-        <swagger2.version>2.6.0</swagger2.version>
+        <swagger2.version>3.0.0</swagger2.version>
     </properties>
 
     <modules>
@@ -80,6 +80,11 @@
                 <artifactId>jakarta.persistence-api</artifactId>
                 <version>3.1.0</version>
             </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-core</artifactId>
+                <version>1.5.16</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>