Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/InseeFr/Trevas into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
NicoLaval committed Aug 28, 2024
2 parents c08bfca + 66d0678 commit eddb97b
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 36 deletions.
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.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</parent>

<artifactId>coverage</artifactId>
Expand All @@ -22,32 +22,32 @@
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-engine</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-jackson</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-jdbc</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-model</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-parser</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-spark</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>fr.insee.trevas</groupId>
<artifactId>trevas-parent</artifactId>
<packaging>pom</packaging>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<modules>
<module>vtl-parser</module>
<module>vtl-model</module>
Expand Down
6 changes: 3 additions & 3 deletions vtl-csv/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<parent>
<groupId>fr.insee.trevas</groupId>
<artifactId>trevas-parent</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</parent>

<artifactId>vtl-csv</artifactId>
<name>VTL CSV</name>
<description>CSV module for the VTL model</description>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>

<properties>
<sonar.coverage.jacoco.xmlReportPaths>
Expand All @@ -25,7 +25,7 @@
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-model</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.supercsv</groupId>
Expand Down
8 changes: 4 additions & 4 deletions vtl-engine/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<parent>
<groupId>fr.insee.trevas</groupId>
<artifactId>trevas-parent</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</parent>

<artifactId>vtl-engine</artifactId>
<name>VTL Engine</name>
<description>VTL engine framework for Trevas</description>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>

<properties>
<sonar.coverage.jacoco.xmlReportPaths>
Expand All @@ -25,13 +25,13 @@
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-parser</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-model</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions vtl-jackson/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<parent>
<groupId>fr.insee.trevas</groupId>
<artifactId>trevas-parent</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</parent>

<artifactId>vtl-jackson</artifactId>
<name>VTL Jackson</name>
<description>Jackson module for the VTL model</description>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>

<properties>
<sonar.coverage.jacoco.xmlReportPaths>
Expand All @@ -25,7 +25,7 @@
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-model</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions vtl-jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<parent>
<groupId>fr.insee.trevas</groupId>
<artifactId>trevas-parent</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</parent>

<artifactId>vtl-jdbc</artifactId>
<name>VTL JDBC</name>
<description>Dataset wrapper around JDBC result set. Useful to expose SQL tables as VTL datasets</description>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>

<properties>
<sonar.coverage.jacoco.xmlReportPaths>
Expand All @@ -25,14 +25,14 @@
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-model</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-engine</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions vtl-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>fr.insee.trevas</groupId>
<artifactId>trevas-parent</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand All @@ -21,7 +21,7 @@
<artifactId>vtl-model</artifactId>
<name>VTL Model</name>
<description>Model describing VTL expressions and bindings</description>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>

<properties>
<sonar.coverage.jacoco.xmlReportPaths>
Expand Down
4 changes: 2 additions & 2 deletions vtl-parser/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<parent>
<groupId>fr.insee.trevas</groupId>
<artifactId>trevas-parent</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</parent>

<artifactId>vtl-parser</artifactId>
<name>VTL Parser</name>
<description>Artifacts generated by Antlr from the VTL grammar files</description>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>

<!-- Warning: not lastest, align with version embedded by Spark-->
<properties>
Expand Down
12 changes: 6 additions & 6 deletions vtl-sdmx/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<parent>
<groupId>fr.insee.trevas</groupId>
<artifactId>trevas-parent</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</parent>

<artifactId>vtl-sdmx</artifactId>
<name>VTL SDMX</name>
<description>Dataset wrapper around SDMX</description>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>

<repositories>
<repository>
Expand All @@ -40,24 +40,24 @@
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-model</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-engine</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-csv</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-spark</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions vtl-spark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<parent>
<groupId>fr.insee.trevas</groupId>
<artifactId>trevas-parent</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</parent>

<artifactId>vtl-spark</artifactId>
<name>VTL Spark</name>
<description>Trevas engine for Apache Spark</description>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>

<properties>
<sonar.coverage.jacoco.xmlReportPaths>
Expand All @@ -25,13 +25,13 @@
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-model</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>fr.insee.trevas</groupId>
<artifactId>vtl-engine</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down

0 comments on commit eddb97b

Please sign in to comment.