Skip to content

Commit

Permalink
Merge pull request #270 from palatej/develop
Browse files Browse the repository at this point in the history
v2.2.5
  • Loading branch information
palatej authored Nov 6, 2024
2 parents 6cba69d + 2a68a61 commit 2ed5a3c
Show file tree
Hide file tree
Showing 27 changed files with 46 additions and 48 deletions.
2 changes: 1 addition & 1 deletion bvar-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>
<artifactId>bvar-core</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion demetra-sa-advanced-binaries/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<groupId>be.nbb.demetra</groupId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>

<artifactId>demetra-sa-advanced-binaries</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion dfm-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>
<artifactId>dfm-core</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion gairline-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>
<artifactId>gairline-core</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion jd_highfreq/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>
<artifactId>jd_highfreq</artifactId>
<name>jd_highfreq</name>
Expand Down
6 changes: 3 additions & 3 deletions jd_stl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>
<artifactId>jd_stl</artifactId>
<name>jd_stl</name>
Expand All @@ -14,7 +14,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.16</version>
<version>2.0.13</version>
<!--<scope>runtime</scope>-->
</dependency>
<dependency>
Expand All @@ -24,7 +24,7 @@
<dependency>
<groupId>be.nbb.demetra</groupId>
<artifactId>jdemetra-stl</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</dependency>
<dependency>
<groupId>be.nbb.demetra</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jdemetra-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>
<artifactId>jdemetra-core</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion jdemetra-modelling/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>
<artifactId>jdemetra-modelling</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion jdemetra-ssf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>
<artifactId>jdemetra-ssf</artifactId>
<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ public void stressTestUcarima() {
}

@Test
@Disabled("Fails randomly")
public void testUcarima() {
ISsf ssf = Models.ssfUcarima;
SsfData data = Models.ssfX;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ public void stressTestUcarima() {
}

@Test
@Disabled("Fails randomly")
public void testUcarima() {
ISsf ssf = Models.ssfUcarima;
SsfData data = Models.ssfXRandom;
Expand Down
2 changes: 1 addition & 1 deletion jdr/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>

<artifactId>jdr</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdr/src/main/java/ec/tstoolkit/jdr/ws/Workspace.java
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public MultiProcessing newMultiProcessing(String name) {
private final ProcessingContext context;
private final List<MultiProcessing> multiProcessing = new ArrayList<>();

private Workspace(final ProcessingContext context) {
public Workspace(final ProcessingContext context) {
this.context = context;
}

Expand Down
2 changes: 1 addition & 1 deletion jstl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>
<artifactId>jdemetra-stl</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion mairline-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>
<artifactId>mairline-core</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion mixedfreq-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>
<artifactId>mixedfreq-core</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion mtd-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>
<artifactId>mtd-core</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion nbdemetra-gairline/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>
<artifactId>nbdemetra-gairline</artifactId>
<packaging>nbm</packaging>
Expand Down
2 changes: 1 addition & 1 deletion nbdemetra-mairline/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>
<artifactId>nbdemetra-mairline</artifactId>
<packaging>nbm</packaging>
Expand Down
2 changes: 1 addition & 1 deletion nbdemetra-mixedfreq/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>

<artifactId>nbdemetra-mixedfreq</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion nbdemetra-ncore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>

<artifactId>nbdemetra-ncore</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions nbdemetra-sssts/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>
<artifactId>nbdemetra-sssts</artifactId>
<packaging>nbm</packaging>
Expand Down Expand Up @@ -62,7 +62,7 @@
<dependency>
<groupId>be.nbb.demetra</groupId>
<artifactId>sssts-core</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
<exclusions>
<exclusion>
<groupId>eu.europa.ec.joinup.sat</groupId>
Expand Down
2 changes: 1 addition & 1 deletion nbdemetra-sts/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>
<artifactId>nbdemetra-sts</artifactId>
<packaging>nbm</packaging>
Expand Down
38 changes: 19 additions & 19 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
<packaging>pom</packaging>

<name>Demetra - Sa - Advanced</name>
Expand Down Expand Up @@ -53,11 +53,11 @@
<nbm-maven-plugin.version>4.1</nbm-maven-plugin.version>
<brandingToken>nbbdemetra</brandingToken>
<!-- < plugins versions -->
<assertj.version>3.26.3</assertj.version>
<lombok.version>1.18.34</lombok.version>
<assertj.version>3.26.0</assertj.version>
<lombok.version>1.18.32</lombok.version>
<jdemetra.version>2.2.5</jdemetra.version>
<nbdemetra.version>2.2.4-RC1</nbdemetra.version>
<nbbdemetra.version>2.2.4-RC1</nbbdemetra.version>
<nbdemetra.version>2.2.5</nbdemetra.version>
<nbbdemetra.version>2.2.5</nbbdemetra.version>
</properties>

<modules>
Expand Down Expand Up @@ -91,7 +91,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.11.3</version>
<version>5.10.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -163,7 +163,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.4.0</version>
<version>3.3.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -173,17 +173,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.3</version>
<version>3.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.3</version>
<version>3.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.2</version>
<version>3.4.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -193,25 +193,25 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.21.0</version>
<version>3.12.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.1</version>
<version>3.2.3</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit-platform</artifactId>
<version>3.5.1</version>
<version>3.2.3</version>
</dependency>
</dependencies>
</plugin>
<!-- Other -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.8.1</version>
<version>3.6.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -226,12 +226,12 @@
<plugin>
<groupId>de.thetaphi</groupId>
<artifactId>forbiddenapis</artifactId>
<version>3.8</version>
<version>3.7</version>
</plugin>
<plugin>
<groupId>com.github.nbbrd.heylogs</groupId>
<artifactId>heylogs-maven-plugin</artifactId>
<version>0.9.2</version>
<version>0.8.1</version>
</plugin>
<plugin>
<groupId>com.amashchenko.maven.plugin</groupId>
Expand All @@ -246,7 +246,7 @@
<plugin>
<groupId>org.jreleaser</groupId>
<artifactId>jreleaser-maven-plugin</artifactId>
<version>1.15.0</version>
<version>1.12.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -369,12 +369,12 @@
<dependency>
<groupId>org.kordamp.maven</groupId>
<artifactId>pomchecker-enforcer-rules</artifactId>
<version>1.14.0</version>
<version>1.11.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.9.0</version>
<version>1.8.0</version>
</dependency>
</dependencies>
<executions>
Expand Down
2 changes: 1 addition & 1 deletion sssts-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>
<artifactId>sssts-core</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion sts-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>
<artifactId>sts-core</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion sutse-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-sa-advanced-aggregator</artifactId>
<version>2.2.4-RC1</version>
<version>2.2.5</version>
</parent>
<artifactId>sutse-core</artifactId>
<packaging>jar</packaging>
Expand Down

0 comments on commit 2ed5a3c

Please sign in to comment.