Skip to content

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

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

Open
renovate wants to merge 11 commits into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
50390a9
fix(deps): update dependency org.springframework.boot:spring-boot-sta…
renovate[bot] Nov 24, 2025
750e81d
Merge branch 'main' into renovate/major-spring-boot
alicela Nov 24, 2025
b182959
fix: update for springboot 4
alicela Nov 24, 2025
86a04d3
Merge branch 'main' into renovate/major-spring-boot
alexisszmundy Dec 11, 2025
54ad8fe
fix: pom
alexisszmundy Dec 11, 2025
7404735
fix(deps): update dependency org.springdoc:springdoc-openapi-starter-…
renovate[bot] Jan 5, 2026
08f898c
Merge branch 'main' into renovate/major-springdoc.version
alexisszmundy Jan 7, 2026
5e560e7
Merge branch 'main' into renovate/major-spring-boot
alexisszmundy Jan 21, 2026
da5cf5e
Merge branch 'renovate/major-springdoc.version' into renovate/major-s…
alexisszmundy Jan 21, 2026
1094df2
fix: now we need actuator apparently
alexisszmundy Jan 21, 2026
beb4c31
chore: replaced jackson and spring security deprecated
alexisszmundy Jan 26, 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
20 changes: 17 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.5.9</version>
<version>4.0.0</version>
Copy link
Contributor

@alexisszmundy alexisszmundy Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue: La mise à jour vers spring boot 4 importe Jackson 3 ce qui casse le mapping avec le RawResponse du modèle filière qui doit utiliser la v2 pour l'instant sur le batch Generic
à voir avec @aitkarra pour une solution

</parent>

<properties>
<java.version>21</java.version>
<springdoc.version>2.8.15</springdoc.version>
<springdoc.version>3.0.1</springdoc.version>
<mapstruct.version>1.6.3</mapstruct.version>
<cucumber.version>7.33.0</cucumber.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>

<!-- Proprietes sonar -->
<jacoco.version>0.8.14</jacoco.version>
Expand Down Expand Up @@ -63,6 +62,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-cache</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -74,6 +77,17 @@
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-resttestclient</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webmvc-test</artifactId>
<scope>test</scope>
</dependency>

<!-- AssertJ -->
<!-- https://www.baeldung.com/introduction-to-assertj -->
<!-- https://mvnrepository.com/artifact/org.assertj/assertj-core -->
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/fr/insee/genesis/configuration/LogRequestFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@ public class LogRequestFilter extends OncePerRequestFilter {
@Override
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
throws ServletException, IOException {
int cacheLimit = -1;//<0 means no limit

//Cache request to avoid calling twice the same inputStream
ContentCachingRequestWrapper req = new ContentCachingRequestWrapper(request);
ContentCachingRequestWrapper req = new ContentCachingRequestWrapper(request, cacheLimit);
ContentCachingResponseWrapper resp = new ContentCachingResponseWrapper(response);

log.info(REQUEST_MESSAGE_FORMAT,
Expand Down
18 changes: 4 additions & 14 deletions src/main/java/fr/insee/genesis/configuration/auth/security/RoleConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
package fr.insee.genesis.configuration.auth.security;

import jakarta.annotation.PostConstruct;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler;
import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler;
import org.springframework.security.access.hierarchicalroles.RoleHierarchy;
import org.springframework.security.access.hierarchicalroles.RoleHierarchyImpl;
import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@Configuration
@EnableMethodSecurity
@Slf4j
public class RoleConfiguration {

Expand All @@ -41,10 +42,7 @@ public class RoleConfiguration {
private List<String> batchGenericClaims;


public Map<String, List<String>> getRolesByClaim() {
return rolesByClaim;
}

@Getter
private Map<String, List<String>> rolesByClaim;

//Defines a role hierarchy
Expand All @@ -67,14 +65,6 @@ static RoleHierarchy roleHierarchy() {
.build();
}

// and, if using pre-post method security also add
@Bean
static MethodSecurityExpressionHandler methodSecurityExpressionHandler(RoleHierarchy roleHierarchy) {
DefaultMethodSecurityExpressionHandler expressionHandler = new DefaultMethodSecurityExpressionHandler();
expressionHandler.setRoleHierarchy(roleHierarchy);
return expressionHandler;
}

@PostConstruct
public void initialization() {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/fr/insee/genesis/controller/rest/responses/ResponseController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.jspecify.annotations.Nullable;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.lang.Nullable;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.DeleteMapping;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/fr/insee/genesis/controller/utils/ExtendedJsonNormalizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public static JsonNode normalize(JsonNode node) {
}

ObjectNode copy = obj.objectNode();
obj.fields().forEachRemaining(e ->
obj.properties().forEach(e ->
copy.set(e.getKey(), normalize(e.getValue()))
);
return copy;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/fr/insee/genesis/domain/model/surveyunit/Mode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import org.springframework.lang.Nullable;
import org.jspecify.annotations.Nullable;

import java.util.HashMap;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/cucumber/functional_tests/LunaticModelDefinitions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import lombok.extern.slf4j.Slf4j;
import org.assertj.core.api.Assertions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.boot.resttestclient.TestRestTemplate;
import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
Expand Down
4 changes: 3 additions & 1 deletion src/test/java/cucumber/functional_tests/RawDataDefinitions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
import lombok.extern.slf4j.Slf4j;
import org.assertj.core.api.Assertions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.boot.resttestclient.TestRestTemplate;
import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate;
import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
Expand All @@ -62,6 +63,7 @@

@Slf4j
@ContextConfiguration(classes = CucumberSpringConfiguration.class)
@AutoConfigureTestRestTemplate
public class RawDataDefinitions {


Expand Down
8 changes: 5 additions & 3 deletions src/test/java/cucumber/functional_tests/config/CucumberSpringConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
import fr.insee.genesis.infrastructure.repository.SurveyUnitMongoDBRepository;
import io.cucumber.spring.CucumberContextConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;
import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
import org.springframework.boot.data.mongodb.autoconfigure.DataMongoAutoConfiguration;
import org.springframework.boot.mongodb.autoconfigure.MongoAutoConfiguration;
import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.test.context.ActiveProfiles;
Expand All @@ -22,7 +23,8 @@
@CucumberContextConfiguration
@SpringBootTest(classes = GenesisApi.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@ActiveProfiles("test-cucumber")
@EnableAutoConfiguration(exclude = {MongoAutoConfiguration.class, MongoDataAutoConfiguration.class})
@EnableAutoConfiguration(exclude = {MongoAutoConfiguration.class, DataMongoAutoConfiguration.class})
@AutoConfigureTestRestTemplate
public class CucumberSpringConfiguration {
@MockitoBean
private MongoTemplate mongoTemplate;
Expand Down
9 changes: 4 additions & 5 deletions src/test/java/fr/insee/genesis/controller/rest/ControllerAccessTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;
import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.data.mongodb.autoconfigure.DataMongoAutoConfiguration;
import org.springframework.boot.mongodb.autoconfigure.MongoAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.http.HttpMethod;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
Expand All @@ -52,11 +52,10 @@
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;


@SpringBootTest
@AutoConfigureMockMvc
@ActiveProfiles("test")
@EnableAutoConfiguration(exclude = {MongoAutoConfiguration.class, MongoDataAutoConfiguration.class})
@EnableAutoConfiguration(exclude = {MongoAutoConfiguration.class, DataMongoAutoConfiguration.class})
class ControllerAccessTest {

// Constants for user roles
Expand Down
Loading