Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rakambda merged 2 commits into from
Nov 21, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb80ba6
Bump org.springframework.boot from 3.5.7 to 4.0.0
dependabot[bot] Nov 21, 2025
2883d10
Migration
Rakambda Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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>(){
Expand All @@ -90,7 +90,7 @@ springBoot {

jib {
from {
image = "eclipse-temurin:21-jdk"
image = "eclipse-temurin:25-jdk"
platforms {
platform {
os = "linux"
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/fr/rakambda/rsndiscord/spring/Application.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
30 changes: 17 additions & 13 deletions src/main/java/fr/rakambda/rsndiscord/spring/amqp/AmqpConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -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);
Expand All @@ -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);
}
}
Loading