Skip to content

fix(deps): update dependency org.springframework.boot:spring-boot-starter-parent to v4 #636

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
ddecrulle merged 2 commits into from
Nov 4, 2026
+74 −51
Merged

fix(deps): update dependency org.springframework.boot:spring-boot-starter-parent to v4 #636

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
57621c1
fix(deps): update dependency org.springframework.boot:spring-boot-sta…
renovate[bot] Nov 1, 2026
7b43d3a
chore: migrate to Spring Boot 4
ddecrulle Nov 4, 2026
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
18 changes: 17 additions & 1 deletion onyxia-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,24 @@
<artifactId>spring-restdocs-mockmvc</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-webmvc-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-restdocs</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>2.10.0</version>
<version>3.2.0</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -99,6 +109,12 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<!-- Spring Boot 4 defaults to Jackson 3: keep Jackson 2 auto-configuration
so our custom ObjectMapper keeps being used for HTTP messages -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-jackson2</artifactId>
</dependency>

<dependency>
<groupId>com.github.erosb</groupId>
Expand Down
58 changes: 31 additions & 27 deletions onyxia-api/src/main/java/fr/insee/onyxia/api/security/OIDCConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package fr.insee.onyxia.api.security;

import static org.springframework.security.web.util.matcher.AntPathRequestMatcher.antMatcher;
import static org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher.pathPattern;

import fr.insee.onyxia.api.services.UserProvider;
import fr.insee.onyxia.api.services.utils.HttpRequestUtils;
Expand Down Expand Up @@ -107,7 +107,7 @@
}

@Bean
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {

Check warning on line 110 in onyxia-api/src/main/java/fr/insee/onyxia/api/security/OIDCConfiguration.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Replace generic exceptions with specific library exceptions or a custom exception. 


See more on https://sonarcloud.io/project/issues?id=InseeFrLab_onyxia-api&issues=AaGl5vFkM2C0qeWqzNNP&open=AaGl5vFkM2C0qeWqzNNP&pullRequest=636

Check warning on line 110 in onyxia-api/src/main/java/fr/insee/onyxia/api/security/OIDCConfiguration.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove the declaration of thrown exception 'java.lang.Exception', as it cannot be thrown from method's body. 


See more on https://sonarcloud.io/project/issues?id=InseeFrLab_onyxia-api&issues=AaGl5vFkM2C0qeWqzNNQ&open=AaGl5vFkM2C0qeWqzNNQ&pullRequest=636
http.csrf(AbstractHttpConfigurer::disable)
.sessionManagement(
configurer -> {
Expand All @@ -121,43 +121,47 @@
configurer -> {
configurer.requestMatchers(HttpMethod.OPTIONS).permitAll();
// configuration pour Swagger
configurer.requestMatchers(antMatcher("/")).permitAll();
configurer.requestMatchers(antMatcher("/swagger-ui**")).permitAll();
configurer.requestMatchers(antMatcher("/swagger-ui/**")).permitAll();
configurer.requestMatchers(antMatcher("/v2/api-docs")).permitAll();
configurer.requestMatchers(antMatcher("/v3/api-docs")).permitAll();
configurer.requestMatchers(antMatcher("/v3/api-docs/*")).permitAll();
configurer.requestMatchers(antMatcher("/csrf")).permitAll();
configurer.requestMatchers(antMatcher("/webjars/**")).permitAll();
configurer.requestMatchers(pathPattern("/")).permitAll();
configurer.requestMatchers(pathPattern("/swagger-ui**")).permitAll();
configurer.requestMatchers(pathPattern("/swagger-ui/**")).permitAll();
configurer.requestMatchers(pathPattern("/v2/api-docs")).permitAll();
configurer.requestMatchers(pathPattern("/v3/api-docs")).permitAll();
configurer.requestMatchers(pathPattern("/v3/api-docs/*")).permitAll();
configurer.requestMatchers(pathPattern("/csrf")).permitAll();
configurer.requestMatchers(pathPattern("/webjars/**")).permitAll();
configurer
.requestMatchers(antMatcher("/swagger-resources/**"))
.requestMatchers(pathPattern("/swagger-resources/**"))
.permitAll();
configurer.requestMatchers(antMatcher("/actuator/**")).permitAll();
configurer.requestMatchers(antMatcher("/actuator")).permitAll();
configurer.requestMatchers(antMatcher("/api")).permitAll();
configurer.requestMatchers(antMatcher("/api/swagger-ui**")).permitAll();
configurer.requestMatchers(pathPattern("/actuator/**")).permitAll();
configurer.requestMatchers(pathPattern("/actuator")).permitAll();
configurer.requestMatchers(pathPattern("/api")).permitAll();
configurer
.requestMatchers(antMatcher("/api/swagger-ui/**"))
.requestMatchers(pathPattern("/api/swagger-ui**"))
.permitAll();
configurer.requestMatchers(antMatcher("/api/v2/api-docs")).permitAll();
configurer.requestMatchers(antMatcher("/api/v3/api-docs")).permitAll();
configurer
.requestMatchers(antMatcher("/api/v3/api-docs/*"))
.requestMatchers(pathPattern("/api/swagger-ui/**"))
.permitAll();
configurer.requestMatchers(antMatcher("/api/csrf")).permitAll();
configurer.requestMatchers(antMatcher("/api/webjars/**")).permitAll();
configurer.requestMatchers(pathPattern("/api/v2/api-docs")).permitAll();
configurer.requestMatchers(pathPattern("/api/v3/api-docs")).permitAll();
configurer
.requestMatchers(antMatcher("/api/swagger-resources/**"))
.requestMatchers(pathPattern("/api/v3/api-docs/*"))
.permitAll();
configurer.requestMatchers(antMatcher("/api/actuator/**")).permitAll();
configurer.requestMatchers(antMatcher("/api/actuator")).permitAll();
configurer.requestMatchers(antMatcher("/configuration/**")).permitAll();
configurer.requestMatchers(pathPattern("/api/csrf")).permitAll();
configurer.requestMatchers(pathPattern("/api/webjars/**")).permitAll();
configurer
.requestMatchers(antMatcher("/swagger-resources/**"))
.requestMatchers(pathPattern("/api/swagger-resources/**"))
.permitAll();
configurer.requestMatchers(pathPattern("/api/actuator/**")).permitAll();
configurer.requestMatchers(pathPattern("/api/actuator")).permitAll();
configurer
.requestMatchers(pathPattern("/configuration/**"))
.permitAll();
configurer
.requestMatchers(pathPattern("/swagger-resources/**"))
.permitAll();
// configuration pour public
configurer.requestMatchers(antMatcher("/public/**")).permitAll();
configurer.requestMatchers(antMatcher("/api/public/**")).permitAll();
configurer.requestMatchers(pathPattern("/public/**")).permitAll();
configurer.requestMatchers(pathPattern("/api/public/**")).permitAll();
configurer.anyRequest().authenticated();
})
.oauth2ResourceServer(
Expand Down
3 changes: 3 additions & 0 deletions onyxia-api/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,6 @@ health.custom-crd.checks[0].kind=Cluster
health.custom-crd.checks[0].strategy=FIELDS
health.custom-crd.checks[0].desired-field=instances
health.custom-crd.checks[0].ready-field=readyInstances

# Spring Boot 4 defaults to Jackson 3 for HTTP messages; keep using our Jackson 2 ObjectMapper (see CustomObjectMapper)
spring.http.converters.preferred-json-mapper=jackson2
14 changes: 7 additions & 7 deletions onyxia-api/src/test/java/fr/insee/onyxia/api/UserControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.MvcResult;

Expand All @@ -34,15 +34,15 @@ public class UserControllerTest extends BaseTest {

@Autowired private ObjectMapper mapper;

@MockBean private HttpRequestUtils httpRequestUtils;
@MockitoBean private HttpRequestUtils httpRequestUtils;

@MockBean private RegionsConfiguration regionsConfiguration;
@MockitoBean private RegionsConfiguration regionsConfiguration;

@MockBean private SecurityConfig securityConfig;
@MockitoBean private SecurityConfig securityConfig;

@MockBean private OnyxiaUserProvider onyxiaUserProvider;
@MockitoBean private OnyxiaUserProvider onyxiaUserProvider;

@MockBean private UserProvider userProvider;
@MockitoBean private UserProvider userProvider;

@BeforeEach
public void setUp() {
Expand Down
2 changes: 1 addition & 1 deletion onyxia-api/src/test/java/fr/insee/onyxia/api/configuration/BaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import fr.insee.onyxia.api.security.NoSecurityConfiguration;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
import org.springframework.boot.restdocs.test.autoconfigure.AutoConfigureRestDocs;
import org.springframework.context.annotation.Import;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit.jupiter.SpringExtension;
Expand Down
4 changes: 2 additions & 2 deletions onyxia-api/src/test/java/fr/insee/onyxia/api/configuration/checks/DisableChecksForTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package fr.insee.onyxia.api.configuration.checks;

import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.bean.override.mockito.MockitoBean;

@Configuration
public class DisableChecksForTests {

@MockBean CompatibilityChecks compatibilityChecks;
@MockitoBean CompatibilityChecks compatibilityChecks;

public CompatibilityChecks getCompatibilityChecks() {
return compatibilityChecks;
Expand Down
16 changes: 8 additions & 8 deletions ...src/test/java/fr/insee/onyxia/api/controller/api/onboarding/OnboardingControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
import fr.insee.onyxia.model.region.Region;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.test.web.servlet.MockMvc;

@WebMvcTest(OnboardingController.class)
Expand All @@ -29,13 +29,13 @@ class OnboardingControllerTest extends BaseTest {
@Autowired private MockMvc mockMvc;
@Autowired private ObjectMapper mapper;

@MockBean private UserProvider userProvider;
@MockBean private RegionsConfiguration regionsConfiguration;
@MockitoBean private UserProvider userProvider;
@MockitoBean private RegionsConfiguration regionsConfiguration;

@MockBean private HttpRequestUtils httpRequestUtils;
@MockBean private SecurityConfig securityConfig;
@MockBean private OnyxiaUserProvider onyxiaUserProvider;
@MockBean private KubernetesService kubernetesService;
@MockitoBean private HttpRequestUtils httpRequestUtils;
@MockitoBean private SecurityConfig securityConfig;
@MockitoBean private OnyxiaUserProvider onyxiaUserProvider;
@MockitoBean private KubernetesService kubernetesService;

@Test
public void should_not_create_namespace_when_single_project() throws Exception {
Expand Down
6 changes: 3 additions & 3 deletions onyxia-api/src/test/java/fr/insee/onyxia/api/user/OnyxiaUserProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
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;

@SpringBootTest(classes = {OnyxiaUserProvider.class, UserProvider.class})
public class OnyxiaUserProviderTest {

@Autowired OnyxiaUserProvider onyxiaUserProvider;

@MockBean private KubernetesService kubernetesService;
@MockitoBean private KubernetesService kubernetesService;

@MockBean private UserProvider userProvider;
@MockitoBean private UserProvider userProvider;

Region region;
User user;
Expand Down
2 changes: 1 addition & 1 deletion onyxia-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-common</artifactId>
<version>2.10.0</version>
<version>3.2.0</version>
</dependency>

</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.5.16</version>
<version>4.1.2</version>
</parent>
<modules>
<module>onyxia-model</module>
Expand Down
Loading