Upgrade to Spring Boot 3.5.9.

This commit is contained in:
Jesse Brault 2025-12-24 11:48:47 -06:00
parent 8f1efa4902
commit 91168d69cb
2 changed files with 17 additions and 19 deletions

View File

@ -1,7 +1,7 @@
plugins {
id 'java'
id 'org.springframework.boot' version '3.4.0'
id 'io.spring.dependency-management' version '1.1.6'
id 'org.springframework.boot' version '3.5.9'
id 'io.spring.dependency-management' version '1.1.7'
}
group = 'app.mealsmadeeasy'
@ -54,17 +54,17 @@ dependencies {
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
// Custom
implementation 'io.jsonwebtoken:jjwt-api:0.12.6'
implementation 'io.jsonwebtoken:jjwt-jackson:0.12.6'
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.6'
implementation 'io.jsonwebtoken:jjwt-api:0.13.0'
implementation 'io.jsonwebtoken:jjwt-jackson:0.13.0'
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.13.0'
implementation 'org.commonmark:commonmark:0.24.0'
implementation 'org.jsoup:jsoup:1.18.3'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.2'
implementation 'org.commonmark:commonmark:0.27.0'
implementation 'org.jsoup:jsoup:1.21.2'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.20.1'
implementation 'io.minio:minio:8.5.14'
implementation 'io.minio:minio:8.6.0'
compileOnly 'org.jetbrains:annotations:26.0.1'
compileOnly 'org.jetbrains:annotations:26.0.2-1'
// https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-webp
runtimeOnly 'com.twelvemonkeys.imageio:imageio-webp:3.12.0'
@ -75,13 +75,11 @@ dependencies {
// https://mvnrepository.com/artifact/org.apache.xmlgraphics/batik-all
runtimeOnly 'org.apache.xmlgraphics:batik-all:1.19'
compileOnly 'org.jetbrains:annotations:24.1.0'
// Custom testing
testRuntimeOnly 'com.h2database:h2'
testImplementation 'org.testcontainers:testcontainers:1.20.4'
testImplementation 'org.testcontainers:junit-jupiter:1.20.4'
testImplementation "org.testcontainers:minio:1.20.4"
testImplementation 'org.testcontainers:testcontainers:1.21.4'
testImplementation 'org.testcontainers:junit-jupiter:1.21.4'
testImplementation "org.testcontainers:minio:1.21.4"
testFixturesImplementation 'org.hamcrest:hamcrest:3.0'
}

View File

@ -5,6 +5,7 @@ import org.springframework.beans.factory.BeanFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.AuthenticationProvider;
import org.springframework.security.authentication.ProviderManager;
import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
import org.springframework.security.config.Customizer;
@ -58,15 +59,14 @@ public class SecurityConfiguration {
@Bean
public DaoAuthenticationProvider daoAuthenticationProvider() {
final var provider = new DaoAuthenticationProvider();
provider.setUserDetailsService(this.jpaUserDetailsService);
provider.setPasswordEncoder(this.passwordEncoder());
final var provider = new DaoAuthenticationProvider(this.jpaUserDetailsService);
provider.setPasswordEncoder(this.beanFactory.getBean(PasswordEncoder.class));
return provider;
}
@Bean
public AuthenticationManager authenticationManager() {
return new ProviderManager(this.daoAuthenticationProvider());
return new ProviderManager(this.beanFactory.getBean(AuthenticationProvider.class));
}
}