Build(deps): Bump org.springframework.boot:spring-boot-starter-parent…

… from 3.3.6 to 3.4.0 (#964) Bumps [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 3.3.6 to 3.4.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/spring-projects/spring-boot/releases">org.springframework.boot:spring-boot-starter-parent's releases</a>.</em></p> <blockquote> <h2>v3.4.0</h2> <h2>:star: New Features</h2> <ul> <li>Add withDefaultRequestConfigCustomizer method to HttpComponentsClientHttpRequestFactoryBuilder <a href="https://redirect.github.com/spring-projects/spring-boot/issues/43139">#43139</a></li> <li>Fail JsonWriter if duplicate names are detected <a href="https://redirect.github.com/spring-projects/spring-boot/issues/43041">#43041</a></li> <li>Add JsonObjectDeserializer.nullSafeValue method that accepts a mapper Function <a href="https://redirect.github.com/spring-projects/spring-boot/issues/42972">#42972</a></li> <li>Support timeout property for GraphQL over SSE <a href="https://redirect.github.com/spring-projects/spring-boot/pull/42966">#42966</a></li> <li>Improve performance of ConfigurationPropertiesBinder by storing bind handlers on first access <a href="https://redirect.github.com/spring-projects/spring-boot/issues/42950">#42950</a></li> <li>Improve performance of ConcurrentReferenceCachingMetadataReaderFactory <a href="https://redirect.github.com/spring-projects/spring-boot/issues/42949">#42949</a></li> <li>Log warning in HikariCheckpointRestoreLifecycle if pool suspension isn't configured <a href="https://redirect.github.com/spring-projects/spring-boot/pull/42937">#42937</a></li> <li>Remove spring-boot-starter-aop dependency from spring-boot-starter-data-jpa and spring-boot-starter-integration <a href="https://redirect.github.com/spring-projects/spring-boot/issues/42934">#42934</a></li> </ul> <h2>:lady_beetle: Bug Fixes</h2> <ul> <li>Jersey body handling is inconsistent with Spring Webflux and Spring MVC <a href="https://redirect.github.com/spring-projects/spring-boot/issues/43209">#43209</a></li> <li>Classes are accidentally named "structure logging" instead of "structured logging" <a href="https://redirect.github.com/spring-projects/spring-boot/pull/43203">#43203</a></li> <li>StructuredLoggingJsonProperties customizer should be a Class reference rather than a String <a href="https://redirect.github.com/spring-projects/spring-boot/issues/43202">#43202</a></li> <li>Cannot package OCI image when 'docker.io/paketobuildpacks/new-relic' is provided as a buildpack <a href="https://redirect.github.com/spring-projects/spring-boot/issues/43171">#43171</a></li> <li>Incorrect Type for 'management.endpoints.access.default' defined in additional-spring-configuration-metadata.json <a href="https://redirect.github.com/spring-projects/spring-boot/issues/43154">#43154</a></li> <li>WebServerPortFileWriter fails when using a portfile without extension <a href="https://redirect.github.com/spring-projects/spring-boot/issues/43117">#43117</a></li> <li>SslOptions.isSpecified() only returns true if ciphers and enabled protocols are set <a href="https://redirect.github.com/spring-projects/spring-boot/issues/43084">#43084</a></li> <li>SslHealthIndicator throws NullPointerException when using SslBundle with SslStoreBundle.NONE <a href="https://redirect.github.com/spring-projects/spring-boot/issues/43078">#43078</a></li> <li>JdkClientHttpRequestFactoryBuilder and JettyClientHttpRequestFactoryBuilder do not set Ciphers or Enabled Protocols <a href="https://redirect.github.com/spring-projects/spring-boot/issues/43077">#43077</a></li> <li>Root cause of errors is hidden when loading images from archive <a href="https://redirect.github.com/spring-projects/spring-boot/issues/43070">#43070</a></li> <li>mvn spring-boot:run fails on Windows with "Could Not Find or Load Main Class" when path contains non-ASCII characters <a href="https://redirect.github.com/spring-projects/spring-boot/issues/43062">#43062</a></li> <li>A <code>@SpyBean</code> on the output of a FactoryBean is not reset <a href="https://redirect.github.com/spring-projects/spring-boot/issues/43053">#43053</a></li> <li>Logback logging system does not process URLs with paths not ending in .xml <a href="https://redirect.github.com/spring-projects/spring-boot/issues/42990">#42990</a></li> <li>Bean-based conditions do not consider factory beans correctly when determining if they are a candidate <a href="https://redirect.github.com/spring-projects/spring-boot/issues/42970">#42970</a></li> <li>NPE in bootBuildImage when setting DOCKER_CONTEXT=default <a href="https://redirect.github.com/spring-projects/spring-boot/issues/42960">#42960</a></li> <li>Warning due to duplicate MockResolver extensions <a href="https://redirect.github.com/spring-projects/spring-boot/issues/42957">#42957</a></li> <li>HttpHostConnectException is thrown when using buildpacks with Gradle or Maven on Windows <a href="https://redirect.github.com/spring-projects/spring-boot/issues/42952">#42952</a></li> <li>build-info doesn't support seconds since the epoch from project.build.outputTimestamp <a href="https://redirect.github.com/spring-projects/spring-boot/issues/42936">#42936</a></li> <li>NPE in OnClassCondition.resolveOutcomesThreaded following thread interruption because firstHalf is null <a href="https://redirect.github.com/spring-projects/spring-boot/issues/42926">#42926</a></li> <li>Default WebSocketMessageBrokerConfigurer is always overriding custom channel executor <a href="https://redirect.github.com/spring-projects/spring-boot/issues/42924">#42924</a></li> <li>X-Registry-Auth header sent to Docker Engine API contains field "authHeader" <a href="https://redirect.github.com/spring-projects/spring-boot/issues/42915">#42915</a></li> <li>ApplicationContextRunner has inconsistent behaviour with duplicate auto-configuration class names <a href="https://redirect.github.com/spring-projects/spring-boot/issues/17963">#17963</a></li> </ul> <h2>:notebook_with_decorative_cover: Documentation</h2> <ul> <li>Migrate class references to full javadoc links <a href="https://redirect.github.com/spring-projects/spring-boot/issues/43239">#43239</a></li> <li>Documentation for 'spring.datasource.type' is misleading <a href="https://redirect.github.com/spring-projects/spring-boot/issues/43199">#43199</a></li> <li>Update "Upgrading From" section to use "2.x" <a href="https://redirect.github.com/spring-projects/spring-boot/issues/43160">#43160</a></li> <li>Include spring-boot-loader in API documentation <a href="https://redirect.github.com/spring-projects/spring-boot/issues/43153">#43153</a></li> <li>Document how and where to add custom GraalVM configuration files <a href="https://redirect.github.com/spring-projects/spring-boot/issues/43074">#43074</a></li> <li>Rework DataSource configuration examples to separate defining an additional DataSource and defining a DataSource of a different type <a href="https://redirect.github.com/spring-projects/spring-boot/issues/43059">#43059</a></li> <li>Location of the layers schema is incorrect in the Maven Plugin's examples <a href="https://redirect.github.com/spring-projects/spring-boot/issues/43033">#43033</a></li> <li>Link to Eclipse setup instructions <a href="https://redirect.github.com/spring-projects/spring-boot/issues/42954">#42954</a></li> <li>Fix link to Checkpoint and Restore status page <a href="https://redirect.github.com/spring-projects/spring-boot/issues/42939">#42939</a></li> </ul> <h2>:hammer: Dependency Upgrades</h2>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/spring-projects/spring-boot/commit/8964203688c111e11604bc4454743998bc387993"><code>8964203</code></a> Release v3.4.0</li> <li><a href="https://github.com/spring-projects/spring-boot/commit/109e731c8388dafa06159abc4744285b80c6f555"><code>109e731</code></a> Revert "Add <code>@ConditionalOnMissingBean</code> for <code>JobRepository</code>"</li> <li><a href="https://github.com/spring-projects/spring-boot/commit/d21952d6a935bc5e5652b7a0194fde69db24264a"><code>d21952d</code></a> Merge branch '3.3.x'</li> <li><a href="https://github.com/spring-projects/spring-boot/commit/415193827bfe8fbfd02d075759460c8ca2abbfc9"><code>4151938</code></a> Next development version (v3.3.7-SNAPSHOT)</li> <li><a href="https://github.com/spring-projects/spring-boot/commit/14989a5fb779c4366fb405a74c4aaa51207d8145"><code>14989a5</code></a> Upgrade to Testcontainers 1.20.4</li> <li><a href="https://github.com/spring-projects/spring-boot/commit/c188822db3c3698c36954c3222e0f51821032fa1"><code>c188822</code></a> Upgrade to Spring Security 6.4.1</li> <li><a href="https://github.com/spring-projects/spring-boot/commit/e286739cee51c4f713b22c7f9cede77c97e9151b"><code>e286739</code></a> Upgrade to Spring Batch 5.2.0</li> <li><a href="https://github.com/spring-projects/spring-boot/commit/73fc351d71cc9120c794bf6206b389a4dbb4ba4c"><code>73fc351</code></a> Add <code>@ConditionalOnMissingBean</code> for <code>JobRepository</code></li> <li><a href="https://github.com/spring-projects/spring-boot/commit/3cae5c27d1d9edf39fbaff7159a71811ae717ab0"><code>3cae5c2</code></a> Merge branch '3.3.x'</li> <li><a href="https://github.com/spring-projects/spring-boot/commit/933b7d30bb8bbcc1efab9aeb2e4ed722d7230746"><code>933b7d3</code></a> Merge pull request <a href="https://redirect.github.com/spring-projects/spring-boot/issues/43235">#43235</a> from izeye</li> <li>Additional commits viewable in <a href="https://github.com/spring-projects/spring-boot/compare/v3.3.6...v3.4.0">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.springframework.boot:spring-boot-starter-parent&package-manager=maven&previous-version=3.3.6&new-version=3.4.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>
urlaubsverwaltung · Nov 26, 2024 · 1015e04 · 1015e04
2 parents 3e3438a + e4e63a9
commit 1015e04
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.3.6</version>
+    <version>3.4.0</version>
   </parent>
 
   <groupId>de.focus-shift</groupId>

diff --git 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
@@ -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
@@ -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
@@ -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/.../zeiterfassung/integration/urlaubsverwaltung/sicknote/SickNoteEventHandlerRabbitmqIT.java b/.../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
@@ -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