Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 10 additions & 12 deletions .github/workflows/create-release.yaml

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

issue: on doit utilise la dernière version du modèle filière

Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
java-version: '25'

- name: Checkout repo
uses: actions/checkout@v7
uses: actions/checkout@v6
with:
fetch-depth: 0

Expand Down Expand Up @@ -63,18 +63,18 @@ jobs:
needs: check-version
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v7
- uses: actions/checkout@v6
- name: Set up JDK 25
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '25'

- name: install model filiere
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
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

- name: Clone BPM
uses: actions/checkout@v7
uses: actions/checkout@v6
with:
repository: InseeFr/BPM
path: bpm
Expand All @@ -85,11 +85,9 @@ jobs:
mvn clean install --no-transfer-progress
cd ..

- uses: actions/checkout@v7
- name: Build app
run: |
git fetch origin main
git checkout origin/main
- uses: actions/checkout@v6
- name: Build app
run:
mvn package --no-transfer-progress

- name: Upload app jar
Expand All @@ -103,7 +101,7 @@ jobs:
if: needs.check-version.outputs.should_run_next_job == 'true'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v7
- uses: actions/checkout@v6
with:
ref: ${{ github.ref }}
fetch-depth: 0
Expand Down Expand Up @@ -166,7 +164,7 @@ jobs:
needs: [ check-version, create-release ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v7
- uses: actions/checkout@v6

- name: Download uploaded jar
uses: actions/download-artifact@v8
Expand All @@ -182,4 +180,4 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}
default_branch: ${{ github.ref }}
tags: ${{ needs.check-version.outputs.release-tag }}
workdir: .
workdir: .
6 changes: 3 additions & 3 deletions .github/workflows/docker.yaml

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

issue: idem

Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
run: echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >>$GITHUB_OUTPUT
id: extract_branch

- uses: actions/checkout@v7
- uses: actions/checkout@v6
with:
ref: ${{ steps.extract_branch.outputs.branch }}

Expand All @@ -28,7 +28,7 @@ jobs:
java-version: "25"

- name: install model filiere
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
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

- name: Clone BPM
uses: actions/checkout@master
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
- build-snapshot
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v7
- uses: actions/checkout@v6

- name: Download uploaded jar
uses: actions/download-artifact@v8
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Idem

Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v7
- uses: actions/checkout@v6

- name: Set up JDK 25
uses: actions/setup-java@v5
Expand All @@ -30,7 +30,7 @@ jobs:
cache: maven

- name: install model filiere
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
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

- name: Clone BPM
uses: actions/checkout@master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
contains(github.event.pull_request.labels.*.name, 'Version Update - Prod')
steps:
- name: Checkout PR branch
uses: actions/checkout@v7
uses: actions/checkout@v6
with:
ref: ${{ github.head_ref }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/scheduled-version-update.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v7
uses: actions/checkout@v6
with:
path: genesis
ref: main
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:

- name: install model filiere
run: |
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
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

- name: Clone BPM
uses: actions/checkout@master
Expand Down Expand Up @@ -200,7 +200,7 @@ jobs:
runs-on: ubuntu-latest
needs: update-version
steps:
- uses: actions/checkout@v7
- uses: actions/checkout@v6
- name: Wait for merged version commit
run: |
echo "Fetching main branch..."
Expand Down
1 change: 0 additions & 1 deletion .gitignore

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

issue: régression sur gitIgnore

Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ src/bin/

# Package Files #
*.jar
!libs/*.jar
*.war
*.nar
*.ear
Expand Down
12 changes: 0 additions & 12 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,4 @@
# Changelog
## 2.7.2-rc [2026-06-24]
### Fixed
- Change application.properties

## 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
Expand Down
Binary file added libs/modelefiliere-2.1.0.jar
Binary file not shown.
Binary file removed libs/modelefiliere-2.2.2-springboot4.jar
Binary file not shown.
29 changes: 11 additions & 18 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>fr.insee.genesis</groupId>
<artifactId>genesis-api</artifactId>
<version>2.7.4</version>
<version>2.6.9</version>
<packaging>jar</packaging>
<name>genesis-api</name>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>4.1.0</version>
<version>3.5.14</version>
</parent>

<properties>
Expand All @@ -20,12 +20,14 @@
<!-- (!!!) 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.2.1</bpm.version>
<springdoc.version>3.0.3</springdoc.version>
<bpm.version>1.2.0</bpm.version>
<springdoc.version>2.8.17</springdoc.version>
<mapstruct.version>1.6.3</mapstruct.version>
<pitest.version>1.25.5</pitest.version>
<pitest.version>1.25.3</pitest.version>
<pitest.junit.version>1.2.3</pitest.junit.version>

<!-- Sonar properties -->
Expand Down Expand Up @@ -73,19 +75,10 @@
<scope>test</scope>
</dependency>
<dependency>
<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>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-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 -->
Expand Down Expand Up @@ -113,7 +106,7 @@
<dependency>
<groupId>fr.insee</groupId>
<artifactId>modelefiliere</artifactId>
<version>2.2.2-springboot4</version>
<version>2.1.0</version>
</dependency>
<!-- XML libraries -->
<!-- XML-XSLT with Saxon -->
Expand All @@ -127,7 +120,7 @@
<dependency>
<groupId>com.networknt</groupId>
<artifactId>json-schema-validator</artifactId>
<version>3.0.5</version>
<version>3.0.3</version>
</dependency>

<!-- generate implementation auto -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
package fr.insee.genesis.controller.dto;

import fr.insee.genesis.domain.model.surveyunit.InterrogationId;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.time.Instant;
import java.util.ArrayList;
import java.util.List;

@Data
@AllArgsConstructor
@NoArgsConstructor
public class InterrogationBatchResponse {

private List<InterrogationId> interrogationIds = new ArrayList<>();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
package fr.insee.genesis.controller.dto;

import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.time.Instant;

@Data
@AllArgsConstructor
@NoArgsConstructor
public class LastExtractionRequest {

@NotNull
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
package fr.insee.genesis.controller.dto;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.List;

@Builder
@Data
@NoArgsConstructor
@AllArgsConstructor
public class SurveyUnitDto {
private String interrogationId;
private List<VariableDto> collectedVariables;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
package fr.insee.genesis.controller.dto;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.List;

@Builder
@Data
@NoArgsConstructor
@AllArgsConstructor
public class SurveyUnitQualityToolDto {
private String interrogationId;
private List<VariableQualityToolDto> collectedVariables;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@
import fr.insee.genesis.domain.model.surveyunit.VariableModel;
import fr.insee.genesis.domain.model.surveyunit.Mode;
import fr.insee.modelefiliere.RawResponseDto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.time.LocalDateTime;
import java.util.List;

@Builder
@Data
@NoArgsConstructor
@AllArgsConstructor
public class SurveyUnitSimplifiedDto {

private String collectionInstrumentId;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
package fr.insee.genesis.controller.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.List;

@Builder
@Data
@NoArgsConstructor
@AllArgsConstructor
public class VariableDto {
private String variableName;
private String scope;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
package fr.insee.genesis.controller.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

@NoArgsConstructor
@AllArgsConstructor
@Builder
@Data
public class VariableInputDto {
Expand Down
Loading
Loading