Skip to content

Commit dd7301f

Browse files
NicoLavalNicoLaval
committed
Merge branch 'develop' into fix/430
2 parents fe7a8b1 + 6e58b81 commit dd7301f

File tree

45 files changed

+897
-615
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+897
-615
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -97,43 +97,44 @@ jobs:
9797
}]
9898
- name: Test
9999
run: mvn package
100-
test-sonar-package:
101-
name: Run Trevas tests with coverage & sonar checks
102-
# Trevas main repo commit branch or merged PR
103-
if: github.repository == 'InseeFr/Trevas' &&
104-
(github.event_name == 'push' ||
105-
github.event.pull_request.head.repo.fork == false ||
106-
(github.event.pull_request.head.repo.fork == true &&
107-
github.event.pull_request.merged == true))
108-
runs-on: ubuntu-latest
109-
needs: format
110-
steps:
111-
- uses: actions/checkout@v4
112-
with:
113-
fetch-depth: 0
114-
- name: Set up Maven Central Repository
115-
uses: actions/setup-java@v4
116-
with:
117-
java-version: 17
118-
distribution: "adopt"
119-
- uses: s4u/maven-settings-action@v3.0.0
120-
with:
121-
githubServer: false
122-
servers: |
123-
[{
124-
"id": "Github",
125-
"username": "${{ secrets.GH_PACKAGES_USERNAME }}",
126-
"password": "${{ secrets.GH_PACKAGES_PASSWORD }}"
127-
}]
128-
- name: Test, package and analyze with maven & SonarCloud
129-
run: mvn verify sonar:sonar -Pcoverage -Dsonar.projectKey=InseeFr_Trevas -Dsonar.organization=inseefr -Dsonar.host.url=https://sonarcloud.io
130-
env:
131-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
132-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
100+
# test-sonar-package:
101+
# name: Run Trevas tests with coverage & sonar checks
102+
# Trevas main repo commit branch or merged PR
103+
# if: github.repository == 'InseeFr/Trevas' &&
104+
# (github.event_name == 'push' ||
105+
# github.event.pull_request.head.repo.fork == false ||
106+
# (github.event.pull_request.head.repo.fork == true &&
107+
# github.event.pull_request.merged == true))
108+
# runs-on: ubuntu-latest
109+
# needs: format
110+
# steps:
111+
# - uses: actions/checkout@v4
112+
# with:
113+
# fetch-depth: 0
114+
# - name: Set up Maven Central Repository
115+
# uses: actions/setup-java@v4
116+
# with:
117+
# java-version: 17
118+
# distribution: "adopt"
119+
# - uses: s4u/maven-settings-action@v3.0.0
120+
# with:
121+
# githubServer: false
122+
# servers: |
123+
# [{
124+
# "id": "Github",
125+
# "username": "${{ secrets.GH_PACKAGES_USERNAME }}",
126+
# "password": "${{ secrets.GH_PACKAGES_PASSWORD }}"
127+
# }]
128+
# - name: Test, package and analyze with maven & SonarCloud
129+
# run: mvn verify sonar:sonar -Pcoverage -Dsonar.projectKey=InseeFr_Trevas -Dsonar.organization=inseefr -Dsonar.host.url=https://sonarcloud.io
130+
# env:
131+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
132+
# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
133133
publish-release:
134134
name: Publish Trevas modules on Maven
135135
if: startsWith(github.event.ref, 'refs/tags/v')
136-
needs: test-sonar-package
136+
# Temp update because of sonar token issue
137+
needs: test
137138
runs-on: ubuntu-latest
138139
steps:
139140
- uses: actions/checkout@v4

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ Transformation engine and validator for statistics.
55
[![Build Status](https://github.com/InseeFr/Trevas/actions/workflows/ci.yml/badge.svg)](https://github.com/InseeFr/Trevas/actions/workflows/ci.yml)
66
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=InseeFr_Trevas&metric=alert_status)](https://sonarcloud.io/dashboard?id=InseeFr_Trevas)
77
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=InseeFr_Trevas&metric=coverage)](https://sonarcloud.io/dashboard?id=InseeFr_Trevas)
8-
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/fr.insee.trevas/trevas-parent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/fr.insee.trevas/trevas-parent)
8+
[![Maven Central](https://img.shields.io/maven-central/v/fr.insee.trevas/trevas-parent.svg)](
9+
https://central.sonatype.com/artifact/fr.insee.trevas/trevas-parent)
910
[![Javadoc](https://img.shields.io/badge/Javadoc-fr.insee.trevas-ff69b4?logo=java&style=flat-square)](https://javadoc.io/doc/fr.insee.trevas)
1011
[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
1112
[![Mentioned in Awesome Official Statistics ](https://awesome.re/mentioned-badge.svg)](http://www.awesomeofficialstatistics.org)

‎coverage/pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<parent>
77
<groupId>fr.insee.trevas</groupId>
88
<artifactId>trevas-parent</artifactId>
9-
<version>2.1.0-SNAPSHOT</version>
9+
<version>2.2.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>coverage</artifactId>
1313
<description>Aggregate Coverage Report</description>
1414
<name>VTL coverage</name>
15-
<version>2.1.0-SNAPSHOT</version>
15+
<version>2.2.0-SNAPSHOT</version>
1616

1717
<properties>
1818
<sonar.coverage.jacoco.xmlReportPaths>
@@ -24,37 +24,37 @@
2424
<dependency>
2525
<groupId>fr.insee.trevas</groupId>
2626
<artifactId>vtl-engine</artifactId>
27-
<version>2.1.0-SNAPSHOT</version>
27+
<version>2.2.0-SNAPSHOT</version>
2828
</dependency>
2929
<dependency>
3030
<groupId>fr.insee.trevas</groupId>
3131
<artifactId>vtl-jackson</artifactId>
32-
<version>2.1.0-SNAPSHOT</version>
32+
<version>2.2.0-SNAPSHOT</version>
3333
</dependency>
3434
<dependency>
3535
<groupId>fr.insee.trevas</groupId>
3636
<artifactId>vtl-jdbc</artifactId>
37-
<version>2.1.0-SNAPSHOT</version>
37+
<version>2.2.0-SNAPSHOT</version>
3838
</dependency>
3939
<dependency>
4040
<groupId>fr.insee.trevas</groupId>
4141
<artifactId>vtl-model</artifactId>
42-
<version>2.1.0-SNAPSHOT</version>
42+
<version>2.2.0-SNAPSHOT</version>
4343
</dependency>
4444
<dependency>
4545
<groupId>fr.insee.trevas</groupId>
4646
<artifactId>vtl-parser</artifactId>
47-
<version>2.1.0-SNAPSHOT</version>
47+
<version>2.2.0-SNAPSHOT</version>
4848
</dependency>
4949
<dependency>
5050
<groupId>fr.insee.trevas</groupId>
5151
<artifactId>vtl-spark</artifactId>
52-
<version>2.1.0-SNAPSHOT</version>
52+
<version>2.2.0-SNAPSHOT</version>
5353
</dependency>
5454
<dependency>
5555
<groupId>fr.insee.trevas</groupId>
5656
<artifactId>vtl-csv</artifactId>
57-
<version>2.1.0-SNAPSHOT</version>
57+
<version>2.2.0-SNAPSHOT</version>
5858
</dependency>
5959
<dependency>
6060
<groupId>com.fasterxml.jackson.core</groupId>

‎docs/docs/developer-guide/basic-mode/data-sources/jdbc.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ custom_edit_url: null
1212
<dependency>
1313
<groupId>fr.insee.trevas</groupId>
1414
<artifactId>vtl-jdbc</artifactId>
15-
<version>2.0.0</version>
15+
<version>2.1.0</version>
1616
</dependency>
1717
```
1818

‎docs/docs/developer-guide/basic-mode/data-sources/json.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ custom_edit_url: null
1212
<dependency>
1313
<groupId>fr.insee.trevas</groupId>
1414
<artifactId>vtl-jackson</artifactId>
15-
<version>2.0.0</version>
15+
<version>2.1.0</version>
1616
</dependency>
1717
```
1818

‎docs/docs/developer-guide/index-developer-guide.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import Card from '@theme/Card';
1515
<dependency>
1616
<groupId>fr.insee.trevas</groupId>
1717
<artifactId>vtl-engine</artifactId>
18-
<version>2.0.0</version>
18+
<version>2.1.0</version>
1919
</dependency>
2020
```
2121

‎docs/docs/developer-guide/provenance.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ custom_edit_url: null
1212
<dependency>
1313
<groupId>fr.insee.trevas</groupId>
1414
<artifactId>vtl-spark</artifactId>
15-
<version>2.0.0</version>
15+
<version>2.1.0</version>
1616
</dependency>
1717
```
1818

‎docs/docs/developer-guide/spark-mode/index-spark-mode.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The `SparkDataset` data sets can represent statistical tables in a Java applicat
1616
<dependency>
1717
<groupId>fr.insee.trevas</groupId>
1818
<artifactId>vtl-spark</artifactId>
19-
<version>2.0.0</version>
19+
<version>2.1.0</version>
2020
</dependency>
2121
```
2222

‎docs/docs/introduction/releases/2.x.x.mdx‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ slug: /releases/2.x.x
66
custom_edit_url: null
77
---
88

9+
## Version 2.1.0 - 12/27/25
10+
11+
(See technical release on [Github](https://github.com/InseeFr/Trevas/releases/tag/v2.1.0))
12+
13+
- Improve Trevas exceptions to wrap Spark exceptions
14+
- Fix the ability to insert a dot in variable names
15+
916
## Version 2.0.0 - 09/28/25
1017

1118
(See technical release on [Github](https://github.com/InseeFr/Trevas/releases/tag/v2.0.0))

‎docs/i18n/fr/docusaurus-plugin-content-docs/current/developer-guide/basic-mode/data-sources/jdbc.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ custom_edit_url: null
1212
<dependency>
1313
<groupId>fr.insee.trevas</groupId>
1414
<artifactId>vtl-jdbc</artifactId>
15-
<version>2.0.0</version>
15+
<version>2.1.0</version>
1616
</dependency>
1717
```
1818

0 commit comments

Comments
 (0)