STTRS-2600 Update to Spring Boot 4

Author: SamuelGasser

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.8</version>
+        <version>4.0.2</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -19,8 +19,8 @@
 
     <properties>
         <java.version>17</java.version>
-        <spring.boot.version>3.5.8</spring.boot.version>
-        <spring-cloud.version>2025.0.0</spring-cloud.version>
+        <spring.boot.version>4.0.2</spring.boot.version>
+        <spring-cloud.version>2025.1.0</spring-cloud.version>
         <commons-logging.version>1.3.5</commons-logging.version>
         <dependency-check-maven.version>12.2.0</dependency-check-maven.version>
         <netty.version>4.2.7.Final</netty.version>
@@ -82,7 +82,7 @@
         <dependency>
             <groupId>community.solace.spring.boot</groupId>
             <artifactId>spring-boot-starter-solace-client-config</artifactId>
-            <version>2.0.0</version>
+            <version>3.0.0</version>
         </dependency>
         <!-- Spring Cloud -->
         <dependency>
@@ -147,6 +147,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-inline</artifactId>
@@ -158,6 +163,11 @@
             <artifactId>spring-cloud-stream-test-binder</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webmvc-test</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>

src/test/java/community/solace/spring/cloud/requestreply/AbstractRequestReplyLoggingIT.java

@@ -9,8 +9,8 @@
 import org.mockito.Mockito;
 import org.mockito.listeners.MockCreationListener;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;

src/test/java/community/solace/spring/cloud/requestreply/AbstractRequestReplyMessageInterceptorIT.java

@@ -9,8 +9,8 @@
 import org.mockito.Mockito;
 import org.mockito.listeners.MockCreationListener;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;

src/test/java/community/solace/spring/cloud/requestreply/AbstractRequestReplySimpleIT.java

@@ -9,8 +9,8 @@
 import org.mockito.Mockito;
 import org.mockito.listeners.MockCreationListener;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.cloud.stream.function.StreamBridge;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.test.annotation.DirtiesContext;

src/test/java/community/solace/spring/cloud/requestreply/sampleapps/simple/RequestReplyTestSimpleApplication.java

@@ -5,7 +5,6 @@
 import community.solace.spring.cloud.requestreply.service.header.RequestReplyMessageHeaderSupportService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;

src/test/java/community/solace/spring/cloud/requestreply/service/RequestReplyLoggingServiceTests.java

@@ -35,9 +35,9 @@
 class RequestReplyLoggingServiceTests extends AbstractRequestReplyLoggingIT {
 
     @Captor
-    ArgumentCaptor<Message<?>> messageCaptor;
+    ArgumentCaptor<Message<?>> messageCaptor = ArgumentCaptor.forClass(Message.class);
     @Captor
-    ArgumentCaptor<String> destinationCaptor;
+    ArgumentCaptor<String> destinationCaptor = ArgumentCaptor.forClass(String.class);
     @MockitoBean
     private StreamBridge streamBridge;
     @Autowired

src/test/java/community/solace/spring/cloud/requestreply/service/RequestReplyMessageReplyWrappingInterceptorTests.java

@@ -30,9 +30,9 @@
 class RequestReplyMessageReplyWrappingInterceptorTests extends AbstractRequestReplyLoggingIT {
 
     @Captor
-    ArgumentCaptor<Message<?>> messageCaptor;
+    ArgumentCaptor<Message<?>> messageCaptor = ArgumentCaptor.forClass(Message.class);
     @Captor
-    ArgumentCaptor<String> destinationCaptor;
+    ArgumentCaptor<String> destinationCaptor = ArgumentCaptor.forClass(String.class);
     @Autowired
     private RequestReplyMessageHeaderSupportService headerSupport;
     @MockitoBean

src/test/java/community/solace/spring/cloud/requestreply/service/RequestReplyMessageSendingInterceptorTests.java

@@ -32,7 +32,7 @@
 class RequestReplyMessageSendingInterceptorTests extends AbstractRequestReplyLoggingIT {
 
     @Captor
-    ArgumentCaptor<Message<?>> messageCaptor;
+    ArgumentCaptor<Message<?>> messageCaptor = ArgumentCaptor.forClass(Message.class);
     @MockitoBean
     private StreamBridge streamBridge;
     @Autowired

src/test/java/community/solace/spring/cloud/requestreply/service/RequestReplySimpleServiceTests.java

@@ -35,9 +35,9 @@
 class RequestReplySimpleServiceTests extends AbstractRequestReplySimpleIT {
 
     @Captor
-    ArgumentCaptor<Message<?>> messageCaptor;
+    ArgumentCaptor<Message<?>> messageCaptor = ArgumentCaptor.forClass(Message.class);
     @Captor
-    ArgumentCaptor<String> destinationCaptor;
+    ArgumentCaptor<String> destinationCaptor = ArgumentCaptor.forClass(String.class);
     @MockitoBean
     private StreamBridge streamBridge;
     @Autowired