From a822f2ed0c84066042a8efbe43869791a2d27c23 Mon Sep 17 00:00:00 2001
From: anuragkumawat <anuragkumawat7@gmail.com>
Date: Fri, 29 Mar 2024 16:11:09 +0530
Subject: [PATCH] JAVA-30993 Upgrade spring-boot-di, spring-boot-aws to
 spring-boot-3 (#16221)

* JAVA-30993 Upgrade spring-boot-di, spring-boot-aws to spring-boot-3

* JAVA-30993 Revert maven shade plugin version upgrade
---
 spring-boot-modules/pom.xml                   |  4 ++--
 spring-boot-modules/spring-boot-aws/pom.xml   | 24 +++++++++++++++----
 .../DisplayBeanIntegrationTest.java           |  8 +++----
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml
index 2b62b3d1bc..69b5e2b598 100644
--- a/spring-boot-modules/pom.xml
+++ b/spring-boot-modules/pom.xml
@@ -33,7 +33,7 @@
         <module>spring-boot-config-jpa-error</module>
         <module>spring-boot-ctx-fluent</module>
         <module>spring-boot-deployment</module>
-<!--        <module>spring-boot-di</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
+        <module>spring-boot-di</module>
         <module>spring-boot-disable-logging</module>
         <module>spring-boot-ci-cd</module>
         <!-- <module>spring-boot-cli</module> --> <!-- Not a maven project -->
@@ -104,7 +104,7 @@
         <module>spring-boot-properties-3</module> <!-- failing after upgrading to spring boot 3.2.x -->
         <module>spring-boot-properties-4</module>
         <module>spring-boot-properties-migrator-demo</module>
-        <module>spring-boot-aws</module> <!-- This project is Spring Boot 2 and cannot be updated -->
+        <module>spring-boot-aws</module>
         <module>spring-boot-keycloak-adapters</module>
         <module>spring-boot-mvc-legacy</module>
         <module>spring-boot-springdoc-2</module>
diff --git a/spring-boot-modules/spring-boot-aws/pom.xml b/spring-boot-modules/spring-boot-aws/pom.xml
index 44cd38be3f..8be0b230cd 100644
--- a/spring-boot-modules/spring-boot-aws/pom.xml
+++ b/spring-boot-modules/spring-boot-aws/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.11</version>
+        <version>3.1.5</version>
         <relativePath/>
     </parent>
 
@@ -24,8 +24,21 @@
         </dependency>
         <dependency>
             <groupId>com.amazonaws.serverless</groupId>
-            <artifactId>aws-serverless-java-container-springboot2</artifactId>
-            <version>${aws-serverless-java-container-springboot2.version}</version>
+            <artifactId>aws-serverless-java-container-springboot3</artifactId>
+            <version>${aws-serverless-java-container.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws.serverless</groupId>
+            <artifactId>aws-serverless-java-container-core</artifactId>
+            <version>${aws-serverless-java-container.version}</version>
+            <classifier>tests</classifier>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>${httpclient5.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -74,10 +87,11 @@
     </build>
 
     <properties>
-        <aws-serverless-java-container-springboot2.version>1.9.1</aws-serverless-java-container-springboot2.version>
-        <maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
+        <aws-serverless-java-container.version>2.0.0</aws-serverless-java-container.version>
+        <maven-shade-plugin.version>3.3.0</maven-shade-plugin.version>
         <maven.compiler.source.version>11</maven.compiler.source.version>
         <maven.compiler.target.version>11</maven.compiler.target.version>
+        <httpclient5.version>5.3.1</httpclient5.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-di/src/test/java/com/baeldung/displayallbeans/DisplayBeanIntegrationTest.java b/spring-boot-modules/spring-boot-di/src/test/java/com/baeldung/displayallbeans/DisplayBeanIntegrationTest.java
index f08a755fc7..4e157e4e13 100644
--- a/spring-boot-modules/spring-boot-di/src/test/java/com/baeldung/displayallbeans/DisplayBeanIntegrationTest.java
+++ b/spring-boot-modules/spring-boot-di/src/test/java/com/baeldung/displayallbeans/DisplayBeanIntegrationTest.java
@@ -13,10 +13,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.actuate.beans.BeansEndpoint.ContextBeans;
+import org.springframework.boot.actuate.beans.BeansEndpoint.ContextBeansDescriptor;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -54,12 +54,12 @@ public class DisplayBeanIntegrationTest {
 
     @Test
     public void givenRestTemplate_whenAccessEndpointUrl_thenHttpStatusOK() throws Exception {
-        ParameterizedTypeReference<Map<String, ContextBeans>> responseType = new ParameterizedTypeReference<Map<String, ContextBeans>>() {
+        ParameterizedTypeReference<Map<String, ContextBeansDescriptor>> responseType = new ParameterizedTypeReference<Map<String, ContextBeansDescriptor>>() {
         };
         RequestEntity<Void> requestEntity = RequestEntity.get(new URI("http://localhost:" + this.mgt + ACTUATOR_PATH + "/beans"))
             .accept(MediaType.APPLICATION_JSON)
             .build();
-        ResponseEntity<Map<String, ContextBeans>> entity = this.testRestTemplate.exchange(requestEntity, responseType);
+        ResponseEntity<Map<String, ContextBeansDescriptor>> entity = this.testRestTemplate.exchange(requestEntity, responseType);
 
         then(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
     }