Skip to content

Commit f7f33ce

Browse files
vpinna80vpinna80
committed
VTL E&E 1.2.0 Release
1 parent 5861f78 commit f7f33ce

File tree

7 files changed

+69
-27
lines changed

7 files changed

+69
-27
lines changed

‎pom.xml

+36-21
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
</profiles>
154154

155155
<properties>
156-
<revision>1.2.0-SNAPSHOT</revision>
156+
<revision>1.2.0</revision>
157157

158158
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
159159
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -187,16 +187,11 @@
187187

188188
<scala.version>2.13.13</scala.version>
189189
<scala.compat.version>2.13</scala.compat.version>
190-
<spark.version>3.5.1</spark.version>
191-
192-
<ac-lang.version>2.6</ac-lang.version>
193-
<ac-lang3.version>3.14.0</ac-lang3.version>
194-
<ac-math3.version>3.6.1</ac-math3.version>
195-
<ac-compress.version>1.26.1</ac-compress.version>
196-
<ac-collection.version>3.2.2</ac-collection.version>
190+
<spark.version>3.5.4</spark.version>
197191

192+
<ac-lang3.version>3.17.0</ac-lang3.version>
193+
<jackson.version>2.18.2</jackson.version>
198194
<picocli.version>4.7.5</picocli.version>
199-
<jackson.version>2.15.2</jackson.version>
200195
<jaxb.version>4.0.2</jaxb.version>
201196
<jaxb.runtime.version>4.0.5</jaxb.runtime.version>
202197
<thymeleaf.version>3.1.2.RELEASE</thymeleaf.version>
@@ -217,7 +212,8 @@
217212
<scmUrl>https://github.com/vpinna80/VTL</scmUrl>
218213
<siteUrl>https://vpinna80.github.io/VTL</siteUrl>
219214
<licenseUrl>
220-
https://joinup.ec.europa.eu/sites/default/files/custom-page/attachment/2020-03/EUPL-1.2%20EN.txt</licenseUrl>
215+
https://joinup.ec.europa.eu/sites/default/files/custom-page/attachment/2020-03/EUPL-1.2%20EN.txt
216+
</licenseUrl>
221217
</properties>
222218

223219
<distributionManagement>
@@ -274,6 +270,30 @@
274270
<version>${project.version}</version>
275271
<type>pom</type>
276272
</dependency>
273+
<dependency>
274+
<groupId>it.bancaditalia.oss.vtl</groupId>
275+
<artifactId>vtl-bundles</artifactId>
276+
<version>${project.version}</version>
277+
<type>pom</type>
278+
</dependency>
279+
<dependency>
280+
<groupId>it.bancaditalia.oss.vtl</groupId>
281+
<artifactId>vtl-r</artifactId>
282+
<version>${project.version}</version>
283+
<type>pom</type>
284+
</dependency>
285+
<dependency>
286+
<groupId>it.bancaditalia.oss.vtl</groupId>
287+
<artifactId>vtl-java2r</artifactId>
288+
<version>${project.version}</version>
289+
</dependency>
290+
<dependency>
291+
<groupId>it.bancaditalia.oss.vtl</groupId>
292+
<artifactId>vtl-editor</artifactId>
293+
<version>${project.version}</version>
294+
<type>zip</type>
295+
<classifier>bundle</classifier>
296+
</dependency>
277297
<dependency>
278298
<groupId>it.bancaditalia.oss.vtl</groupId>
279299
<artifactId>vtl-bundle-deps</artifactId>
@@ -355,12 +375,14 @@
355375
<version>${antlr4.version}</version>
356376
</dependency>
357377
<dependency>
358-
<groupId>jakarta.activation</groupId>
359-
<artifactId>jakarta.activation-api</artifactId>
360-
<version>2.0.1</version>
378+
<groupId>com.fasterxml.jackson</groupId>
379+
<artifactId>jackson-bom</artifactId>
380+
<type>pom</type>
381+
<version>${jackson.version}</version>
382+
<scope>import</scope>
361383
</dependency>
362384

363-
<!-- fixes for dependency convergence errors in sdmx.io fusion -->
385+
<!-- fixes for dependency convergence errors -->
364386
<dependency>
365387
<groupId>org.apache.commons</groupId>
366388
<artifactId>commons-lang3</artifactId>
@@ -424,13 +446,6 @@
424446
</dependency>
425447

426448
<!-- spark environment -->
427-
<dependency>
428-
<groupId>com.fasterxml.jackson</groupId>
429-
<artifactId>jackson-bom</artifactId>
430-
<type>pom</type>
431-
<version>${jackson.version}</version>
432-
<scope>import</scope>
433-
</dependency>
434449
<dependency>
435450
<groupId>org.scala-lang</groupId>
436451
<artifactId>scala-reflect</artifactId>

‎vtl-api/src/main/java/it/bancaditalia/oss/vtl/config/ConfigurationManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public default VTLSession createSession(Reader reader) throws IOException
8383

8484
/**
8585
* Creates a new, empty workspace.
86-
* @return The newly created {@link Woprkspace} instance
86+
* @return The newly created {@link Workspace} instance
8787
*/
8888
public Workspace createWorkspace();
8989

‎vtl-bundles/vtl-coverage/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@
6767
<artifactId>log4j-slf4j2-impl</artifactId>
6868
<scope>test</scope>
6969
</dependency>
70+
<dependency>
71+
<groupId>org.mockito</groupId>
72+
<artifactId>mockito-junit-jupiter</artifactId>
73+
<scope>test</scope>
74+
</dependency>
7075
</dependencies>
7176

7277
<reporting>

‎vtl-bundles/vtl-r/RVTL/src/main/resources/R/R/vtl.R

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
# See the License for the specific language governing
1818
# permissions and limitations under the License.
1919
#
20-
###############################################################################
2120

2221
#' @title Launch VTL editor
2322
#' @description This command opens a shiny-based rich editor for writing and testing VTL programs.

‎vtl-bundles/vtl-r/RVTL/src/main/resources/R/tests/testthat/test-rvtl.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright © 2025 Banca D'Italia
2+
# Copyright © 2020 Banca D'Italia
33
#
44
# Licensed under the EUPL, Version 1.2 (the "License");
55
# You may not use this work except in compliance with the

‎vtl-envs/vtl-envbase/src/main/java/it/bancaditalia/oss/vtl/impl/environment/util/CSVParseUtils.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
import it.bancaditalia.oss.vtl.impl.types.data.date.SemesterPeriodHolder;
6666
import it.bancaditalia.oss.vtl.impl.types.data.date.YearPeriodHolder;
6767
import it.bancaditalia.oss.vtl.impl.types.dataset.DataStructureComponentImpl;
68+
import it.bancaditalia.oss.vtl.impl.types.domain.EntireDateDomainSubset;
6869
import it.bancaditalia.oss.vtl.impl.types.names.VTLAliasImpl;
6970
import it.bancaditalia.oss.vtl.model.data.Component;
7071
import it.bancaditalia.oss.vtl.model.data.Component.Attribute;
@@ -81,6 +82,7 @@
8182
import it.bancaditalia.oss.vtl.model.domain.IntegerDomainSubset;
8283
import it.bancaditalia.oss.vtl.model.domain.NumberDomainSubset;
8384
import it.bancaditalia.oss.vtl.model.domain.StringDomainSubset;
85+
import it.bancaditalia.oss.vtl.model.domain.TimeDomain;
8486
import it.bancaditalia.oss.vtl.model.domain.TimeDomainSubset;
8587
import it.bancaditalia.oss.vtl.model.domain.TimePeriodDomain;
8688
import it.bancaditalia.oss.vtl.model.domain.TimePeriodDomainSubset;
@@ -243,11 +245,13 @@ else if (domain instanceof TimeDomainSubset)
243245
if (items.length == 1)
244246
try
245247
{
246-
return DateValue.of(parseString(stringRepresentation, "YYYY-MM-DD"));
248+
ScalarValue<?, ?, EntireDateDomainSubset, DateDomain> date = DateValue.of(parseString(stringRepresentation, "YYYY-MM-DD"));
249+
return GenericTimeValue.of(date, date);
247250
}
248251
catch (RuntimeException last)
249252
{
250-
return stringToTimePeriod(stringRepresentation);
253+
TimePeriodValue<?> timePeriod = stringToTimePeriod(stringRepresentation);
254+
return GenericTimeValue.of(timePeriod, timePeriod);
251255
}
252256
else
253257
for (int i = 0; i < 2; i++)
@@ -276,7 +280,7 @@ else if (domain instanceof TimeDomainSubset)
276280
return GenericTimeValue.of((TimeValue<?, ?, ?, ?>) limits[0], (TimeValue<?, ?, ?, ?>) limits[1]);
277281
}
278282

279-
public static ScalarValue<?, ?, ?, ?> stringToTimePeriod(final String stringRepresentation)
283+
public static TimePeriodValue<?> stringToTimePeriod(final String stringRepresentation)
280284
{
281285
DateTimeException last = null;
282286
for (DateTimeFormatter formatter : FORMATTERS.keySet())

‎vtl-types/src/main/java/it/bancaditalia/oss/vtl/impl/types/operators/PartitionToRank.java

+19
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
/*
2+
* Copyright © 2020 Banca D'Italia
3+
*
4+
* Licensed under the EUPL, Version 1.2 (the "License");
5+
* You may not use this work except in compliance with the
6+
* License.
7+
* You may obtain a copy of the License at:
8+
*
9+
* https://joinup.ec.europa.eu/sites/default/files/custom-page/attachment/2020-03/EUPL-1.2%20EN.txt
10+
*
11+
* Unless required by applicable law or agreed to in
12+
* writing, software distributed under the License is
13+
* distributed on an "AS IS" basis,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
15+
* express or implied.
16+
*
17+
* See the License for the specific language governing
18+
* permissions and limitations under the License.
19+
*/
120
package it.bancaditalia.oss.vtl.impl.types.operators;
221

322
import java.util.ArrayList;

0 commit comments

Comments
 (0)