Merge branch 'main' into feature/local-datetime-support

Author: Hajarel-moukh

.github/workflows/create-release.yaml

@@ -71,7 +71,7 @@ jobs:
           java-version: '25'
 
       - name: install model filiere
-        run: mvn install:install-file -Dfile="$(pwd)/libs/modelefiliere-2.1.0.jar" -DgroupId=fr.insee -DartifactId=modelefiliere -Dversion=2.1.0 -Dpackaging=jar -DgeneratePom=true
+        run: mvn install:install-file -Dfile="$(pwd)/libs/modelefiliere-2.2.2-springboot4.jar" -DgroupId=fr.insee -DartifactId=modelefiliere -Dversion=2.2.2-springboot4 -Dpackaging=jar -DgeneratePom=true
 
       - name: Clone BPM
         uses: actions/checkout@v6
@@ -86,7 +86,7 @@ jobs:
           cd ..
 
       - uses: actions/checkout@v6
-      - name: Build app
+      - name: Build app        
         run: |
           git fetch origin main
           git checkout origin/main
@@ -182,4 +182,4 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
           default_branch: ${{ github.ref }}
           tags: ${{ needs.check-version.outputs.release-tag }}
-          workdir: .
+          workdir: .

.github/workflows/docker.yaml

@@ -28,7 +28,7 @@ jobs:
           java-version: "25"
 
       - name: install model filiere
-        run: mvn install:install-file -Dfile="$(pwd)/libs/modelefiliere-2.1.0.jar" -DgroupId=fr.insee -DartifactId=modelefiliere -Dversion=2.1.0 -Dpackaging=jar -DgeneratePom=true
+        run: mvn install:install-file -Dfile="$(pwd)/libs/modelefiliere-2.2.2-springboot4.jar" -DgroupId=fr.insee -DartifactId=modelefiliere -Dversion=2.2.2-springboot4 -Dpackaging=jar -DgeneratePom=true
 
       - name: Clone BPM
         uses: actions/checkout@master

.github/workflows/maven.yml

@@ -30,7 +30,7 @@ jobs:
         cache: maven
 
     - name: install model filiere
-      run: mvn install:install-file -Dfile="$(pwd)/libs/modelefiliere-2.1.0.jar" -DgroupId=fr.insee -DartifactId=modelefiliere -Dversion=2.1.0 -Dpackaging=jar -DgeneratePom=true
+      run: mvn install:install-file -Dfile="$(pwd)/libs/modelefiliere-2.2.2-springboot4.jar" -DgroupId=fr.insee -DartifactId=modelefiliere -Dversion=2.2.2-springboot4 -Dpackaging=jar -DgeneratePom=true
 
     - name: Clone BPM
       uses: actions/checkout@master

.github/workflows/scheduled-version-update.yaml

@@ -87,7 +87,7 @@ jobs:
 
       - name: install model filiere
         run: |
-          mvn install:install-file -Dfile="$(pwd)/genesis/libs/modelefiliere-2.1.0.jar" -DgroupId=fr.insee -DartifactId=modelefiliere -Dversion=2.1.0 -Dpackaging=jar -DgeneratePom=true
+          mvn install:install-file -Dfile="$(pwd)/genesis/libs/modelefiliere-2.2.2-springboot4.jar" -DgroupId=fr.insee -DartifactId=modelefiliere -Dversion=2.2.2-springboot4 -Dpackaging=jar -DgeneratePom=true
 
       - name: Clone BPM
         uses: actions/checkout@master

.gitignore

@@ -33,6 +33,7 @@ src/bin/
 
 # Package Files #
 *.jar
+!libs/*.jar
 *.war
 *.nar
 *.ear

CHANGELOG.md

@@ -1,4 +1,12 @@
 # Changelog
+## 2.7.0 [2026-06-18]
+### Changed
+- spring-boot 3.5.14 -> 4.0.6
+
+## 2.6.10 [2026-06-18]
+### Fixed
+- Aligned the conversion logic for multi-iteration variables with single-value variables during collectedVariables creation to avoid unexpected xxx.0 values for INTEGER variables.
+
 ## 2.6.9 [2026-06-11]
 ### Fixed
 - Delete only expired V2 schedules from dataProcessingContext

libs/modelefiliere-2.1.0.jar

@@ -4,14 +4,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fr.insee.genesis</groupId>
     <artifactId>genesis-api</artifactId>
-    <version>2.6.9</version>
+    <version>2.7.0</version>
     <packaging>jar</packaging>
     <name>genesis-api</name>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.14</version>
+        <version>4.0.6</version>
     </parent>
 
     <properties>
@@ -20,14 +20,12 @@
         <!-- (!!!) Dependency versions temporary overwritten for security reasons -->
         <tomcat.version>10.1.55</tomcat.version>
         <commons-lang3.version>3.20.0</commons-lang3.version>
-        <junit-jupiter.version>5.13.4</junit-jupiter.version>
-        <jackson-bom.version>2.21.1</jackson-bom.version>
 
         <!-- Dependency versions not managed by Spring -->
-        <bpm.version>1.1.5</bpm.version>
-        <springdoc.version>2.8.17</springdoc.version>
+        <bpm.version>1.2.0</bpm.version>
+        <springdoc.version>3.0.3</springdoc.version>
         <mapstruct.version>1.6.3</mapstruct.version>
-        <pitest.version>1.25.3</pitest.version>
+        <pitest.version>1.25.5</pitest.version>
         <pitest.junit.version>1.2.3</pitest.junit.version>
 
         <!-- Sonar properties -->
@@ -75,10 +73,19 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-test</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webmvc-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
         <!-- AssertJ -->
         <!-- https://www.baeldung.com/introduction-to-assertj -->
         <!-- https://mvnrepository.com/artifact/org.assertj/assertj-core -->
@@ -106,7 +113,7 @@
         <dependency>
             <groupId>fr.insee</groupId>
             <artifactId>modelefiliere</artifactId>
-            <version>2.1.0</version>
+            <version>2.2.2-springboot4</version>
         </dependency>
         <!-- XML libraries -->
         <!-- XML-XSLT with Saxon -->

libs/modelefiliere-2.2.2-springboot4.jar

@@ -1,12 +1,16 @@
 package fr.insee.genesis.controller.dto;
 
 import fr.insee.genesis.domain.model.surveyunit.Mode;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 @Data
 public class SurveyUnitInputDto {
     private String questionnaireId;