Bump org.springframework.boot from 3.5.7 to 4.0.0 (#418)

Bumps
[org.springframework.boot](https://github.com/spring-projects/spring-boot)
from 3.5.7 to 4.0.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/spring-projects/spring-boot/releases">org.springframework.boot's
releases</a>.</em></p>
<blockquote>
<h2>v4.0.0</h2>
<h2>:star: New Features</h2>
<ul>
<li>Change tomcat and jetty runtime modules to starters <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48175">#48175</a></li>
<li>Rename spring-boot-kotlin-serialization to align with the name of
the Kotlinx module that it pulls in <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48076">#48076</a></li>
</ul>
<h2>:lady_beetle: Bug Fixes</h2>
<ul>
<li>Error properties are a general web concern and should not be located
beneath server.* <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48201">#48201</a></li>
<li>With both Jackson 2 and 3 on the classpath, <code>@jsontest</code>
fails due to duplicate jacksonTesterFactoryBean <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48198">#48198</a></li>
<li>Gradle war task does not exclude starter POMs from lib-provided <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48197">#48197</a></li>
<li>spring.test.webclient.mockrestserviceserver.enabled is not aligned
with its module's name <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48193">#48193</a></li>
<li>SslMeterBinder doesn't register metrics for dynamically added
bundles if no bundles exist at bind time <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48182">#48182</a></li>
<li>Properties bound in the child management context ignore the parent's
environment prefix <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48177">#48177</a></li>
<li>ssl.chain.expiry metrics doesn't update for dynamically registered
SSL bundles <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48171">#48171</a></li>
<li>Starter for spring-boot-micrometer-metrics is missing <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48161">#48161</a></li>
<li>Elasticsearch client's sniffer functionality should not be enabled
by default <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48155">#48155</a></li>
<li>spring-boot-starter-elasticsearch should depend on
elasticsearch-java <a
href="https://redirect.github.com/spring-projects/spring-boot/pull/48141">#48141</a></li>
<li>Auto-configuration exclusions are checked using a different class
loader to the one that loads auto-configuration classes <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48132">#48132</a></li>
<li>New arm64 macbooks fail to bootBuildImage due to incorrect platform
image <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48128">#48128</a></li>
<li>Properties for configuring an isolated JsonMapper or ObjectMapper
are incorrectly named <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48116">#48116</a></li>
<li>Buildpack fails with recent Docker installs due to hardcoded version
in URL <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48103">#48103</a></li>
<li>Image building may fail when specifying a platform if an image has
already been built with a different platform <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48099">#48099</a></li>
<li>Default values of Kotlinx Serialization JSON configuration
properties are not documented <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48097">#48097</a></li>
<li>Custom XML converters should override defaults in
HttpMessageConverters <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48096">#48096</a></li>
<li>Kotlin serialization is used too aggressively when other JSON
libraries are available <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48070">#48070</a></li>
<li>PortInUseException incorrectly thrown on failure to bind port due to
Netty IP misconfiguration <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48059">#48059</a></li>
<li>Auto-configured JCacheMetrics cannot be customized <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48057">#48057</a></li>
<li>WebSecurityCustomizer beans are excluded by WebMvcTest <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48055">#48055</a></li>
<li>Deprecated EnvironmentPostProcessor does not resolve arguments <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48047">#48047</a></li>
<li>RetryPolicySettings should refer to maxRetries, not maxAttempts <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48023">#48023</a></li>
<li>Devtools Restarter does not work with a parameterless main method <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/47996">#47996</a></li>
<li>Dependency management for Kafka should not manage Scala 2.12
libraries <a
href="https://redirect.github.com/spring-projects/spring-boot/pull/47991">#47991</a></li>
<li>spring-boot-mail should depend on jakarta.mail:jakarta.mail-api and
org.eclipse.angus:angus-mail instead of org.eclipse.angus:jakarta.mail
<a
href="https://redirect.github.com/spring-projects/spring-boot/issues/47983">#47983</a></li>
<li>spring-boot-starter-data-mongodb-reactive has dependency on
reactor-test <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/47982">#47982</a></li>
<li>Support for ReactiveElasticsearchClient is in the wrong module <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/47848">#47848</a></li>
</ul>
<h2>:notebook_with_decorative_cover: Documentation</h2>
<ul>
<li>Removed property spring.test.webclient.register-rest-template is
still documented <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48199">#48199</a></li>
<li>Mention support for detecting AWS ECS in &quot;Deploying to the
Cloud&quot; <a
href="https://redirect.github.com/spring-projects/spring-boot/pull/48170">#48170</a></li>
<li>Revise AWS section of &quot;Deploying to the Cloud&quot; in
reference manual <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48163">#48163</a></li>
<li>Fix typo in PortInUseException Javadoc <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48134">#48134</a></li>
<li>Correct section about required setters in &quot;Type-safe
Configuration Properties&quot; <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48131">#48131</a></li>
<li>Use since attribute in configuration properties deprecation
consistently <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48122">#48122</a></li>
<li>Document EndpointJsonMapper and
management.endpoints.jackson.isolated-json-mapper <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48115">#48115</a></li>
<li>Document support for configuring servlet context init parameters
using properties <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48112">#48112</a></li>
<li>Some configuration properties are not documented in the appendix <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48095">#48095</a></li>
<li>Clarify how warnings about soon-to-expire SSL certificates are
reported <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48063">#48063</a></li>
<li>Document how to use ContextPropagatingTaskDecorator for propagating
trace context over thread boundaries <a
href="https://redirect.github.com/spring-projects/spring-boot/issues/48053">#48053</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/spring-projects/spring-boot/commit/1c0e08b4c434b0e77a83098267b2a0f5a3fc56d7"><code>1c0e08b</code></a>
Release v4.0.0</li>
<li><a
href="https://github.com/spring-projects/spring-boot/commit/34879288f9305e8fb4ca292607e0f997e48a60c6"><code>3487928</code></a>
Merge branch '3.5.x'</li>
<li><a
href="https://github.com/spring-projects/spring-boot/commit/29b8e969782bef3802784754c1e970fe513a36dc"><code>29b8e96</code></a>
Switch make-default in preparation for Spring Boot 4.0.0</li>
<li><a
href="https://github.com/spring-projects/spring-boot/commit/88da0ddb940fc4f68a9bf161080cb7b5ef454753"><code>88da0dd</code></a>
Merge branch '3.5.x'</li>
<li><a
href="https://github.com/spring-projects/spring-boot/commit/56feeaa9a036de7fed2ec7e40a4db624adb0858d"><code>56feeaa</code></a>
Next development version (v3.5.9-SNAPSHOT)</li>
<li><a
href="https://github.com/spring-projects/spring-boot/commit/3becdc7d47f5c0a9478d1a734f4ee94f84a1e7bd"><code>3becdc7</code></a>
Move server.error properties to spring.web.error</li>
<li><a
href="https://github.com/spring-projects/spring-boot/commit/2b306329ae0df5ff94ab5846744083fe4df506c7"><code>2b30632</code></a>
Merge branch '3.5.x'</li>
<li><a
href="https://github.com/spring-projects/spring-boot/commit/4f03b44e972fac9ab11b833daa5c1ec328712fd8"><code>4f03b44</code></a>
Merge branch '3.4.x' into 3.5.x</li>
<li><a
href="https://github.com/spring-projects/spring-boot/commit/3d15c13270a78dc6334aee2dd2fac9d7f5c41794"><code>3d15c13</code></a>
Next development version (v3.4.13-SNAPSHOT)</li>
<li><a
href="https://github.com/spring-projects/spring-boot/commit/dc140dfc2ea951b75dbb2ba910972318d919759d"><code>dc140df</code></a>
Upgrade to Spring Framework 7.0.1</li>
<li>Additional commits viewable in <a
href="https://github.com/spring-projects/spring-boot/compare/v3.5.7...v4.0.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.springframework.boot&package-manager=gradle&previous-version=3.5.7&new-version=4.0.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>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Thomas Couchoud <1688389+Rakambda@users.noreply.github.com>

Author: dependabot[bot]

build.gradle.kts

@@ -32,7 +32,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
     implementation("org.springframework.boot:spring-boot-starter-log4j2")
     implementation("org.springframework.boot:spring-boot-starter-validation")
-    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.springframework.boot:spring-boot-starter-webmvc")
     implementation("org.springframework.boot:spring-boot-starter-webflux")
     implementation("org.apache.logging.log4j:log4j-layout-template-json")
     modules {
@@ -74,8 +74,8 @@ repositories {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_25
+    targetCompatibility = JavaVersion.VERSION_25
 }
 
 tasks.withType<JavaCompile>(){
@@ -90,7 +90,7 @@ springBoot {
 
 jib {
     from {
-        image = "eclipse-temurin:21-jdk"
+        image = "eclipse-temurin:25-jdk"
         platforms {
             platform {
                 os = "linux"

gradle/libs.versions.toml

@@ -8,7 +8,7 @@ opus-version = "1.1.1"
 
 names-version = "0.53.0"
 jib-version = "3.5.1"
-sptringboot-version = "3.5.7"
+sptringboot-version = "4.0.0"
 sptringboot-dm-version = "1.1.7"
 
 [libraries]

src/main/java/fr/rakambda/rsndiscord/spring/Application.java

@@ -2,7 +2,7 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @SpringBootApplication(scanBasePackages = "fr.rakambda.rsndiscord.spring")

src/main/java/fr/rakambda/rsndiscord/spring/amqp/AmqpConfiguration.java

@@ -1,6 +1,5 @@
 package fr.rakambda.rsndiscord.spring.amqp;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.amqp.core.Binding;
 import org.springframework.amqp.core.BindingBuilder;
 import org.springframework.amqp.core.CustomExchange;
@@ -9,13 +8,15 @@
 import org.springframework.amqp.rabbit.annotation.EnableRabbit;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
+import org.springframework.amqp.support.converter.JacksonJsonMessageConverter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.retry.backoff.ExponentialBackOffPolicy;
-import org.springframework.retry.support.RetryTemplate;
+import org.springframework.core.retry.RetryPolicy;
+import org.springframework.core.retry.RetryTemplate;
+import org.springframework.util.backoff.ExponentialBackOff;
+import tools.jackson.databind.json.JsonMapper;
 import java.util.Map;
 
 @Configuration
@@ -47,14 +48,17 @@ public Binding delayBinding(@Qualifier("delayQueue") Queue testeQueue, @Qualifie
 	}
 
 	@Bean
-	public RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory, Jackson2JsonMessageConverter messageConverter){
-		var backOffPolicy = new ExponentialBackOffPolicy();
-		backOffPolicy.setInitialInterval(1000);
-		backOffPolicy.setMultiplier(10);
-		backOffPolicy.setMaxInterval(60000);
+	public RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory, JacksonJsonMessageConverter messageConverter){
+		var backOff = new ExponentialBackOff();
+		backOff.setInitialInterval(1000);
+		backOff.setMultiplier(10);
+		backOff.setMaxInterval(60000);
 
-		var retryTemplate = new RetryTemplate();
-		retryTemplate.setBackOffPolicy(backOffPolicy);
+		var retryPolicy = RetryPolicy.builder()
+				.backOff(backOff)
+				.build();
+		
+		var retryTemplate = new RetryTemplate(retryPolicy);
 
 		var rabbitTemplate = new RabbitTemplate(connectionFactory);
 		rabbitTemplate.setMessageConverter(messageConverter);
@@ -63,7 +67,7 @@ public RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory, Jackso
 	}
 
 	@Bean
-	public Jackson2JsonMessageConverter producerJackson2MessageConverter(ObjectMapper jsonObjectMapper){
-		return new Jackson2JsonMessageConverter(jsonObjectMapper);
+	public JacksonJsonMessageConverter producerJackson2MessageConverter(JsonMapper jsonMapper){
+		return new JacksonJsonMessageConverter(jsonMapper);
 	}
 }