Uplift to SB 3.4.0 - most deprecations fixed

aidanwhiteley · Dec 12, 2024 · 80f832d · 80f832d
1 parent 0079aee
commit 80f832d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>com.aidanwhiteley</groupId>
     <artifactId>books</artifactId>
-    <version>0.50.5-RELEASE</version>
+    <version>0.60.0-RELEASE</version>
     <packaging>jar</packaging>
 
     <name>Books Microservice</name>
@@ -33,21 +33,25 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.5</version>
+        <version>3.4.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>21</java.version>
-        <spring-cloud.version>2023.0.3</spring-cloud.version>
+        <spring-cloud.version>2024.0.0</spring-cloud.version>
         <!-- SonarCloud -->
         <sonar.projectKey>com.aidanwhiteley:books</sonar.projectKey>
         <sonar.organization>aidanwhiteley-github</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/jacoco/jacoco.xml
         </sonar.coverage.jacoco.xmlReportPaths>
+        <!-- Temporary back-levelling to earlier version to a 3.3.x SB version as using
+            later Mongo driver not yet supported by mongo-java-server. See
+            https://github.com/bwaldvogel/mongo-java-server/issues/233 -->
+        <mongodb.version>5.1.1</mongodb.version>
     </properties>
 
     <dependencies>
@@ -130,7 +134,7 @@
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>
-            <version>3.3.5</version>
+            <version>3.4.1</version>
         </dependency>
 
         <dependency>
@@ -164,7 +168,7 @@
         <dependency>
             <groupId>io.gatling.highcharts</groupId>
             <artifactId>gatling-charts-highcharts</artifactId>
-            <version>3.12.0</version>
+            <version>3.13.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -182,7 +186,7 @@
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-            <version>2.6.0</version>
+            <version>2.7.0</version>
         </dependency>
 
     </dependencies>
@@ -261,7 +265,7 @@
             <plugin>
                 <groupId>io.gatling</groupId>
                 <artifactId>gatling-maven-plugin</artifactId>
-                <version>4.10.1</version>
+                <version>4.11.0</version>
             </plugin>
 
             <!-- To build to local Docker daemon use:
@@ -321,7 +325,7 @@
                     <plugin>
                         <groupId>org.pitest</groupId>
                         <artifactId>pitest-maven</artifactId>
-                        <version>1.15.2</version>
+                        <version>1.17.2</version>
                         <executions>
                             <execution>
                                 <id>pitest</id>

diff --git a/src/test/java/com/aidanwhiteley/books/controller/BookSecureControllerWithMocksTest.java b/src/test/java/com/aidanwhiteley/books/controller/BookSecureControllerWithMocksTest.java
@@ -8,29 +8,26 @@
 import com.aidanwhiteley.books.util.JwtAuthenticationUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.security.Principal;
 import java.util.Collections;
 import java.util.Optional;
 
-import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 @ExtendWith(SpringExtension.class)
 class BookSecureControllerWithMocksTest {
 
     private static final String BOOK_ID_1 = "1234";
     private static final String GOOGLE_BOOK_ID_1 = "g1234";
     private static final String GOOGLE_BOOK_ID_2 = "g5678";
-    @MockBean
+    @MockitoBean
     private JwtAuthenticationUtils jwtAuthenticationUtils;
-    @MockBean
+    @MockitoBean
     private BookRepository bookRepository;
-    @MockBean
+    @MockitoBean
     private GoogleBooksDaoSync googleBooksDaoSync;
 
     @Test