Skip to content

Commit

Permalink
Merge branch 'release/1.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
FranckCo committed Jul 28, 2024
2 parents 78b670c + f4e4eb0 commit 8cbd0f2
Show file tree
Hide file tree
Showing 164 changed files with 4,854 additions and 2,317 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Set up Maven Central Repository
uses: actions/setup-java@v4
with:
java-version: 17
java-version: 8
distribution: "adopt"
- uses: s4u/maven-settings-action@v3.0.0
with:
Expand All @@ -58,7 +58,7 @@ jobs:
"password": "${{ secrets.GH_PACKAGES_PASSWORD }}"
}]
- name: Test
run: mvn package
run: mvn package -DskipTests
test-sonar-package:
name: Run Trevas tests with coverage & sonar checks
# Trevas main repo commit branch or merged PR
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
- name: Set up Maven Central Repository
uses: actions/setup-java@v4
with:
java-version: 17
java-version: 8
distribution: "adopt"
- uses: s4u/maven-settings-action@v3.0.0
with:
Expand All @@ -154,7 +154,7 @@ jobs:
"password": "${{ secrets.GH_PACKAGES_PASSWORD }}"
}]
- name: Publish package
run: mvn --batch-mode deploy
run: mvn --batch-mode deploy -DskipTests
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MAVEN_OPTS: -Dorg.slf4j.simpleLogger.defaultLogLevel='warn'
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ If you want to contribute, see this [guide](docs/CONTRIBUTING.md).

## Requirements

Open JDK 11.0.4 + is required.
Open JDK 8+ is required.
14 changes: 7 additions & 7 deletions coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>fr.insee.trevas</groupId>
<artifactId>trevas-parent</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</parent>

<artifactId>coverage</artifactId>
Expand All @@ -22,32 +22,32 @@
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-engine</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</dependency>
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-jackson</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</dependency>
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-jdbc</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</dependency>
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-model</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</dependency>
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-parser</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</dependency>
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-spark</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</dependency>
</dependencies>
<build>
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/developer-guide/basic-mode/data-sources/jdbc.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ custom_edit_url: null
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-jdbc</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/developer-guide/basic-mode/data-sources/json.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ custom_edit_url: null
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-jackson</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/developer-guide/index-developer-guide.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import Card from '@theme/Card';
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-engine</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/developer-guide/spark-mode/index-spark-mode.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The `SparkDataset` data sets can represent statistical tables in a Java applicat
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-spark</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</dependency>
```

Expand Down
8 changes: 7 additions & 1 deletion docs/docs/introduction/releases/1.x.x.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,19 @@ slug: /releases/1.x.x
custom_edit_url: null
---

## Version 1.5.0 - 06/27/24

(See technical release on [Github](https://github.com/InseeFr/Trevas/releases/tag/v1.5.0))

- Requires Java 8 or above

## Version 1.4.1 - 06/25/24

(See technical release on [Github](https://github.com/InseeFr/Trevas/releases/tag/v1.4.1))

- Fix VTL SDMX module visibility

## Version 1.4.0 - 06/21/24
## Version 1.4.0 - 06/07/24

(See technical release on [Github](https://github.com/InseeFr/Trevas/releases/tag/v1.4.0))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ custom_edit_url: null
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-jdbc</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</dependency>
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ custom_edit_url: null
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-jackson</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</dependency>
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import Card from '@theme/Card';
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-engine</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</dependency>
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Les datasets `SparkDataset` permettent de représenter les tables statistiques d
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-spark</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</dependency>
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,19 @@ slug: /releases/1.x.x
custom_edit_url: null
---

## Version 1.5.0 - 27/06/24

(See technical release on [Github](https://github.com/InseeFr/Trevas/releases/tag/v1.5.0))

- Requires Java 8 or above

## Version 1.4.1 - 25/06/24

(See technical release on [Github](https://github.com/InseeFr/Trevas/releases/tag/v1.4.1))

- Correction de la visibilité du module VTL SDMX

## Version 1.4.0 - 21/06/24
## Version 1.4.0 - 07/06/24

(See technical release on [Github](https://github.com/InseeFr/Trevas/releases/tag/v1.4.0))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ custom_edit_url: null
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-jdbc</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</dependency>
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ custom_edit_url: null
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-jackson</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</dependency>
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import Card from '@theme/Card';
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-engine</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</dependency>
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ custom_edit_url: null
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-spark</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</dependency>
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,19 @@ slug: /releases/1.x.x
custom_edit_url: null
---

## Version 1.4.1 - 06/25/24
## Versjon 1.5.0 - 06/27/24

(See technical release on [Github](https://github.com/InseeFr/Trevas/releases/tag/v1.5.0))

- Nécessite Java 8 ou supérieur

## Versjon 1.4.1 - 06/25/24

(Se teknisk utgivelse på [Github](https://github.com/InseeFr/Trevas/releases/tag/v1.4.1))

- Fiks VTL SDMX-modulsynlighet

## Versjon 1.4.0 - 06/21/24
## Versjon 1.4.0 - 06/07/24

(Se teknisk utgivelse på [Github](https://github.com/InseeFr/Trevas/releases/tag/v1.4.0))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ custom_edit_url: null
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-jdbc</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</dependency>
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ custom_edit_url: null
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-jackson</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</dependency>
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import Card from '@theme/Card';
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-engine</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</dependency>
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Les datasets `SparkDataset` permettent de représenter les tables statistiques d
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-spark</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>
</dependency>
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,19 @@ custom_edit_url: null
pagination_prev: null
---

## 版本 1.5.0 - 06/27/24

(请参阅技术发布 [Github](https://github.com/InseeFr/Trevas/releases/tag/v1.5.0))

- 需要 Java 8 或更高版本

## 版本 1.4.1 - 06/25/24

(请参阅技术发布 [Github](https://github.com/InseeFr/Trevas/releases/tag/v1.4.1))

- 修复 VTL SDMX 模块可见性

## 版本 1.4.0 - 06/21/24
## 版本 1.4.0 - 06/07/24

(请参阅技术发布 [Github](https://github.com/InseeFr/Trevas/releases/tag/v1.4.0))

Expand Down
8 changes: 4 additions & 4 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"react-player": "^2.16.0",
"react-scroll": "^1.8.8",
"react-slick": "^0.29.0",
"sass": "^1.77.6",
"sass": "^1.77.8",
"typed.js": "^2.0.12"
},
"devDependencies": {
Expand All @@ -67,11 +67,11 @@
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-simple-import-sort": "^10.0.0",
"prettier": "^3.3.2",
"prettier": "^3.3.3",
"prettier-linter-helpers": "^1.0.0",
"typescript": "^5.5.3"
"typescript": "^5.5.4"
},
"browserslist": {
"production": [
Expand Down
Loading

0 comments on commit 8cbd0f2

Please sign in to comment.