diff --git a/pom.xml b/pom.xml
index 5d65d668c..4cb92ce4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
org.springframework.boot
spring-boot-starter-parent
- 3.3.6
+ 3.4.0
de.focus-shift
diff --git a/src/test/java/de/focusshift/zeiterfassung/absence/AbsenceIT.java b/src/test/java/de/focusshift/zeiterfassung/absence/AbsenceIT.java
index 9818d66f8..2091d4362 100644
--- a/src/test/java/de/focusshift/zeiterfassung/absence/AbsenceIT.java
+++ b/src/test/java/de/focusshift/zeiterfassung/absence/AbsenceIT.java
@@ -19,8 +19,8 @@
import org.springframework.amqp.rabbit.core.RabbitTemplate;
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.context.annotation.Import;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
import java.time.Instant;
import java.time.LocalDate;
@@ -64,9 +64,9 @@ class AbsenceIT extends SingleTenantTestContainersBase {
private static final ZoneOffset ZONE_ID = UTC;
- @MockBean
+ @MockitoBean
private UserSettingsProvider userSettingsProvider;
- @MockBean(answer = Answers.CALLS_REAL_METHODS)
+ @MockitoBean(answers = Answers.CALLS_REAL_METHODS)
private TenantContextHolder tenantContextHolder;
@Autowired
diff --git a/src/test/java/de/focusshift/zeiterfassung/absence/AbsenceRepositoryIT.java b/src/test/java/de/focusshift/zeiterfassung/absence/AbsenceRepositoryIT.java
index 1523c52b6..a568ca6c1 100644
--- a/src/test/java/de/focusshift/zeiterfassung/absence/AbsenceRepositoryIT.java
+++ b/src/test/java/de/focusshift/zeiterfassung/absence/AbsenceRepositoryIT.java
@@ -7,7 +7,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.transaction.annotation.Transactional;
import java.time.Instant;
@@ -29,7 +29,7 @@ class AbsenceRepositoryIT extends SingleTenantTestContainersBase {
@Autowired
private AbsenceRepository sut;
- @MockBean
+ @MockitoBean
private TenantContextHolder tenantContextHolder;
/**
diff --git a/src/test/java/de/focusshift/zeiterfassung/absence/AbsenceTypeIT.java b/src/test/java/de/focusshift/zeiterfassung/absence/AbsenceTypeIT.java
index fb8aa48b2..52665ac1e 100644
--- a/src/test/java/de/focusshift/zeiterfassung/absence/AbsenceTypeIT.java
+++ b/src/test/java/de/focusshift/zeiterfassung/absence/AbsenceTypeIT.java
@@ -12,8 +12,8 @@
import org.springframework.amqp.rabbit.core.RabbitTemplate;
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.context.annotation.Import;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.transaction.annotation.Transactional;
import java.util.Locale;
@@ -47,7 +47,7 @@ class AbsenceTypeIT extends SingleTenantTestContainersBase {
@Autowired
private RabbitTemplate rabbitTemplate;
- @MockBean(answer = Answers.CALLS_REAL_METHODS)
+ @MockitoBean(answers = Answers.CALLS_REAL_METHODS)
private TenantContextHolder tenantContextHolder;
@Test
diff --git a/src/test/java/de/focusshift/zeiterfassung/feedback/FeedbackGivenListenerEmailTest.java b/src/test/java/de/focusshift/zeiterfassung/feedback/FeedbackGivenListenerEmailTest.java
index 794e76cda..7af5889f6 100644
--- a/src/test/java/de/focusshift/zeiterfassung/feedback/FeedbackGivenListenerEmailTest.java
+++ b/src/test/java/de/focusshift/zeiterfassung/feedback/FeedbackGivenListenerEmailTest.java
@@ -6,8 +6,8 @@
import org.mockito.ArgumentCaptor;
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.context.ApplicationEventPublisher;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.thymeleaf.ITemplateEngine;
import org.thymeleaf.context.IContext;
@@ -33,13 +33,13 @@ class FeedbackGivenListenerEmailTest {
@Autowired
private ApplicationEventPublisher applicationEventPublisher;
- @MockBean
+ @MockitoBean
private EMailService eMailService;
- @MockBean(name = "emailTemplateEngine")
+ @MockitoBean(name = "emailTemplateEngine")
private ITemplateEngine emailTemplateEngine;
- @MockBean
+ @MockitoBean
private FeedbackConfigurationProperties feedbackConfigurationProperties;
@Test
diff --git a/src/test/java/de/focusshift/zeiterfassung/integration/urlaubsverwaltung/sicknote/SickNoteEventHandlerRabbitmqIT.java b/src/test/java/de/focusshift/zeiterfassung/integration/urlaubsverwaltung/sicknote/SickNoteEventHandlerRabbitmqIT.java
index 7a6f746d9..9edbae6d6 100644
--- a/src/test/java/de/focusshift/zeiterfassung/integration/urlaubsverwaltung/sicknote/SickNoteEventHandlerRabbitmqIT.java
+++ b/src/test/java/de/focusshift/zeiterfassung/integration/urlaubsverwaltung/sicknote/SickNoteEventHandlerRabbitmqIT.java
@@ -24,8 +24,8 @@
import org.springframework.amqp.rabbit.core.RabbitTemplate;
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.context.annotation.Import;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
import java.time.Instant;
import java.time.LocalDate;
@@ -72,9 +72,9 @@ class SickNoteEventHandlerRabbitmqIT extends SingleTenantTestContainersBase {
private static final ZoneOffset ZONE_ID = UTC;
- @MockBean
+ @MockitoBean
private UserSettingsProvider userSettingsProvider;
- @MockBean(answer = Answers.CALLS_REAL_METHODS)
+ @MockitoBean(answers = Answers.CALLS_REAL_METHODS)
private TenantContextHolder tenantContextHolder;
@Autowired
diff --git a/src/test/java/de/focusshift/zeiterfassung/report/ReportCsvServiceIT.java b/src/test/java/de/focusshift/zeiterfassung/report/ReportCsvServiceIT.java
index 5750321fc..1d5c662d0 100644
--- a/src/test/java/de/focusshift/zeiterfassung/report/ReportCsvServiceIT.java
+++ b/src/test/java/de/focusshift/zeiterfassung/report/ReportCsvServiceIT.java
@@ -11,7 +11,7 @@
import org.junit.jupiter.params.provider.CsvSource;
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 java.io.PrintWriter;
import java.time.YearMonth;
@@ -29,7 +29,7 @@ class ReportCsvServiceIT extends SingleTenantTestContainersBase {
@Autowired
private ReportCsvService sut;
- @MockBean
+ @MockitoBean
private UserManagementService userManagementService;
@ParameterizedTest