Update dependencies (#628)

uhawaii-system-its-ti-iam · Dec 17, 2024 · 5eedf8e · 5eedf8e
1 parent 5470e17
commit 5eedf8e
Show file tree

Hide file tree

Showing 15 changed files with 50 additions and 50 deletions.
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
     <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>
 
@@ -89,7 +89,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-vault-config</artifactId>
-            <version>4.1.3</version>
+            <version>4.2.0</version>
         </dependency>
     </dependencies>
     <build>
@@ -176,7 +176,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.5.2</version>
                 <configuration>
                     <excludes>
                         <exclude>**/Test*.java</exclude>

diff --git a/src/test/java/edu/hawaii/its/api/configuration/OotbGrouperPropertyConfigurerTest.java b/src/test/java/edu/hawaii/its/api/configuration/OotbGrouperPropertyConfigurerTest.java
@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.DynamicPropertyRegistry;
@@ -36,7 +36,7 @@ public class OotbGrouperPropertyConfigurerTest {
     @Autowired
     private ApplicationContext context;
 
-    @MockBean
+    @MockitoBean
     private OotbGroupingPropertiesService ootbGroupingPropertiesService;
 
     @DynamicPropertySource

diff --git a/src/test/java/edu/hawaii/its/api/controller/EmailRestControllerTest.java b/src/test/java/edu/hawaii/its/api/controller/EmailRestControllerTest.java
@@ -15,7 +15,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
@@ -38,7 +38,7 @@ class EmailRestControllerTest {
     @Autowired
     private WebApplicationContext context;
 
-    @MockBean
+    @MockitoBean
     private EmailService emailService;
 
     private MockMvc mockMvc;

diff --git a/src/test/java/edu/hawaii/its/api/controller/ErrorControllerAdviceTest.java b/src/test/java/edu/hawaii/its/api/controller/ErrorControllerAdviceTest.java
@@ -16,7 +16,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
@@ -54,27 +54,27 @@ public class ErrorControllerAdviceTest {
     @Value("${groupings.api.success}")
     private String SUCCESS;
 
-    @MockBean
+    @MockitoBean
     private AsyncJobsManager asyncJobsManager;
 
-    @MockBean
+    @MockitoBean
     private GroupingAttributeService groupingAttributeService;
 
-    @MockBean
+    @MockitoBean
     private GroupingAssignmentService groupingAssignmentService;
 
-    @MockBean
+    @MockitoBean
     private MemberAttributeService memberAttributeService;
 
-    @MockBean
+    @MockitoBean
     private MembershipService membershipService;
 
-    @MockBean
+    @MockitoBean
     private UpdateMemberService updateMemberService;
-    @MockBean
+    @MockitoBean
     private GroupingOwnerService groupingOwnerService;
 
-    @MockBean
+    @MockitoBean
     private MemberService memberService;
 
     @Autowired

diff --git a/src/test/java/edu/hawaii/its/api/controller/GroupingsRestControllerv2_1Test.java b/src/test/java/edu/hawaii/its/api/controller/GroupingsRestControllerv2_1Test.java
@@ -27,7 +27,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
@@ -92,33 +92,33 @@ public class GroupingsRestControllerv2_1Test {
     @Value("${groupings.api.success}")
     private String SUCCESS;
 
-    @MockBean
+    @MockitoBean
     private AsyncJobsManager asyncJobsManager;
 
-    @MockBean
+    @MockitoBean
     private GroupingAttributeService groupingAttributeService;
 
-    @MockBean
+    @MockitoBean
     private GroupingAssignmentService groupingAssignmentService;
 
-    @MockBean
+    @MockitoBean
     private MemberAttributeService memberAttributeService;
 
-    @MockBean
+    @MockitoBean
     private MembershipService membershipService;
 
-    @MockBean
+    @MockitoBean
     private UpdateMemberService updateMemberService;
-    @MockBean
+    @MockitoBean
     private GroupingOwnerService groupingOwnerService;
 
-    @MockBean
+    @MockitoBean
     private GroupingsService groupingsService;
 
-    @MockBean
+    @MockitoBean
     private MemberService memberService;
 
-    @MockBean
+    @MockitoBean
     private OotbGroupingPropertiesService ootbGroupingPropertiesService;
 
     @Autowired

diff --git a/src/test/java/edu/hawaii/its/api/controller/OotbRestControllerTest.java b/src/test/java/edu/hawaii/its/api/controller/OotbRestControllerTest.java
@@ -19,7 +19,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
@@ -44,7 +44,7 @@ public class OotbRestControllerTest {
     private String CURRENT_USER;
     @Value("${groupings.api.success}")
     private String SUCCESS;
-    @MockBean
+    @MockitoBean
     private OotbGroupingPropertiesService ootbGroupingPropertiesService;
     @Autowired
     private WebApplicationContext context;

diff --git a/src/test/java/edu/hawaii/its/api/service/AsyncJobsManagerTest.java b/src/test/java/edu/hawaii/its/api/service/AsyncJobsManagerTest.java
@@ -11,7 +11,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.ActiveProfiles;
 
 import edu.hawaii.its.api.configuration.SpringBootWebApplication;
@@ -25,7 +25,7 @@ public class AsyncJobsManagerTest {
     @Value("${groupings.api.current_user}")
     private String CURRENT_USER;
 
-    @MockBean
+    @MockitoBean
     private MemberService memberService;
 
     @Autowired

diff --git a/src/test/java/edu/hawaii/its/api/service/EmailServiceTest.java b/src/test/java/edu/hawaii/its/api/service/EmailServiceTest.java
@@ -16,8 +16,8 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.mail.MailException;
 import org.springframework.mail.MailSendException;
@@ -39,13 +39,13 @@ public class EmailServiceTest {
 
     private static Feedback feedback;
 
-    @SpyBean
+    @MockitoSpyBean
     private EmailService emailService;
 
-    @SpyBean
+    @MockitoSpyBean
     private JavaMailSender javaMailSender;
 
-    @MockBean
+    @MockitoBean
     private SubjectService subjectService;
 
     @Value("${app.environment}")

diff --git a/src/test/java/edu/hawaii/its/api/service/GroupingAssignmentServiceTest.java b/src/test/java/edu/hawaii/its/api/service/GroupingAssignmentServiceTest.java
@@ -9,7 +9,7 @@
 import org.junit.jupiter.api.TestInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 import edu.hawaii.its.api.configuration.GroupingsTestConfiguration;
 import edu.hawaii.its.api.configuration.SpringBootWebApplication;
@@ -26,7 +26,7 @@ class GroupingAssignmentServiceTest {
     @Autowired
     private GroupingAssignmentService groupingAssignmentService;
 
-    @MockBean
+    @MockitoBean
     private GrouperService grouperService;
 
     @Autowired

diff --git a/src/test/java/edu/hawaii/its/api/service/MemberAttributeServiceTest.java b/src/test/java/edu/hawaii/its/api/service/MemberAttributeServiceTest.java
@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 import edu.hawaii.its.api.configuration.SpringBootWebApplication;
 import edu.hawaii.its.api.util.PropertyLocator;
@@ -20,7 +20,7 @@ public class MemberAttributeServiceTest {
 
     private PropertyLocator propertyLocator;
 
-    @MockBean
+    @MockitoBean
     private GrouperService grouperService;
 
     @Autowired

diff --git a/src/test/java/edu/hawaii/its/api/service/MemberServiceTest.java b/src/test/java/edu/hawaii/its/api/service/MemberServiceTest.java
@@ -11,7 +11,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.ActiveProfiles;
 
 import edu.hawaii.its.api.configuration.GroupingsTestConfiguration;
@@ -34,7 +34,7 @@ public class MemberServiceTest {
 
     private String groupingPath = "grouping-path";
 
-    @SpyBean
+    @MockitoSpyBean
     private GrouperService grouperService;
 
     @Autowired

diff --git a/src/test/java/edu/hawaii/its/api/service/OotbGrouperApiServiceTest.java b/src/test/java/edu/hawaii/its/api/service/OotbGrouperApiServiceTest.java
@@ -14,7 +14,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.ActiveProfiles;
 
 import edu.hawaii.its.api.configuration.SpringBootWebApplication;
@@ -36,7 +36,7 @@ public class OotbGrouperApiServiceTest {
     @Autowired
     GrouperService grouperService;
 
-    @MockBean
+    @MockitoBean
     private OotbGroupingPropertiesService ootbGroupingPropertiesService;
 
     @Test

diff --git a/src/test/java/edu/hawaii/its/api/service/TestGroupingAssignmentService.java b/src/test/java/edu/hawaii/its/api/service/TestGroupingAssignmentService.java
@@ -22,7 +22,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.ActiveProfiles;
 
 import edu.hawaii.its.api.configuration.SpringBootWebApplication;
@@ -69,7 +69,7 @@ public class TestGroupingAssignmentService {
     @Autowired
     private GrouperService grouperService;
 
-    @SpyBean
+    @MockitoSpyBean
     private GroupingsService groupingsService;
 
     @Autowired

diff --git a/src/test/java/edu/hawaii/its/api/service/TestGroupingsService.java b/src/test/java/edu/hawaii/its/api/service/TestGroupingsService.java
@@ -17,7 +17,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.ActiveProfiles;
 
 import edu.hawaii.its.api.configuration.SpringBootWebApplication;
@@ -50,7 +50,7 @@ public class TestGroupingsService extends ServiceTest {
     @Autowired
     private GroupingsService groupingsService;
 
-    @SpyBean
+    @MockitoSpyBean
     private GrouperService grouperService;
 
     private static String UH_UUID;

diff --git a/src/test/java/edu/hawaii/its/api/service/UpdateMemberServiceTest.java b/src/test/java/edu/hawaii/its/api/service/UpdateMemberServiceTest.java
@@ -10,7 +10,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.ActiveProfiles;
 
 import edu.hawaii.its.api.configuration.GroupingsTestConfiguration;
@@ -39,7 +39,7 @@ public class UpdateMemberServiceTest {
     @Autowired
     private GroupingsTestConfiguration groupingsTestConfiguration;
 
-    @SpyBean
+    @MockitoSpyBean
     private GrouperService grouperService;
 
     @Value("${groupings.api.grouping_admins}")