Merge branch 'develop'

jdemetra · Oct 11, 2023 · 1420043 · 1420043
2 parents 6dc8ec1 + 2392e8a
commit 1420043
Show file tree

Hide file tree

Showing 359 changed files with 7,797 additions and 4,079 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,10 +1,11 @@
 version: 2
 updates:
-  - package-ecosystem: "maven"
+  - package-ecosystem: maven
     target-branch: "develop"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
+      day: "saturday"
     open-pull-requests-limit: 10
   - package-ecosystem: "github-actions"
     target-branch: "develop"

diff --git a/.github/workflows/java-bundled.yml b/.github/workflows/java-bundled.yml
@@ -0,0 +1,59 @@
+name: Update java.bundled
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * SAT'
+
+jobs:
+  update-mvn-property:
+    runs-on: ubuntu-latest
+    name: Update Maven property using the latest release version (tag) of a GitHub repository
+
+    env:
+      DEP_PROP: java.bundled.version
+      DEP_REPO: adoptium/temurin17-binaries
+
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+          fetch-depth: 0
+
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 17
+          cache: 'maven'
+
+      - name: Get latest release version
+        id: lr
+        uses: pozetroninc/github-action-get-latest-release@master
+        with:
+          repository: ${{ env.DEP_REPO }}
+
+      - name: Apply latest release version on Maven property
+        run: >
+          mvn -B -ntp versions:set-property 
+          -Dproperty=${{ env.DEP_PROP }}
+          -DnewVersion=${{ steps.lr.outputs.release }} 
+          -DgenerateBackupPoms=false
+
+      - name: Create Pull Request
+        id: cpr
+        uses: peter-evans/create-pull-request@v5
+        with:
+          commit-message: Bump ${{ env.DEP_PROP }} to ${{ steps.lr.outputs.release }}
+          title: Bump ${{ env.DEP_PROP }} to ${{ steps.lr.outputs.release }}
+          body: ${{ steps.lr.outputs.description }}
+          delete-branch: true
+          branch: PR/maven/${{ github.ref_name }}/${{ env.DEP_PROP }}-${{ steps.lr.outputs.release }}
+          labels: dependencies,java
+
+      - name: Create summary
+        if: ${{ steps.cpr.outputs.pull-request-number }}
+        run: |
+          echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}" >> $GITHUB_STEP_SUMMARY
+          echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}" >> $GITHUB_STEP_SUMMARY
diff --git a/.github/workflows/java-ea-maven.yml b/.github/workflows/java-ea-maven.yml
@@ -11,15 +11,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ '-ea' ]
+        java: [ 20 ]
         os: [ ubuntu-latest ]
 
     name: JDK${{ matrix.java }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0

diff --git a/.github/workflows/java-maven.yml b/.github/workflows/java-maven.yml
@@ -4,7 +4,7 @@ on: [ push, pull_request ]
 
 jobs:
   build-and-test-job:
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+    if: github.event_name == 'pull_request' || startsWith(github.ref, 'refs/heads/develop') || startsWith(github.ref, 'refs/tags/v')
     strategy:
       fail-fast: false
       matrix:
@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0
@@ -28,11 +28,31 @@ jobs:
           java-version: ${{ matrix.java }}
           cache: 'maven'
 
+      - name: Pre-download dependencies with Maven
+        run: mvn -U -B -ntp dependency:go-offline
+
       - name: Build and (headless) test with Maven
         uses: smithki/xvfb-action@v1.1.2
         with:
           run: mvn -U -B -ntp package
 
+  auto-merge-job:
+    needs: build-and-test-job
+    if: startsWith(github.repository, 'jdemetra/') && github.event_name == 'pull_request' && github.actor == 'dependabot[bot]'
+    permissions:
+      contents: write
+      pull-requests: write
+
+    name: Auto-merge on dependabot PR
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Merge PR
+        run: gh pr merge --auto --rebase "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+
   snapshot-job:
     needs: build-and-test-job
     if: startsWith(github.repository, 'jdemetra/') && startsWith(github.ref, 'refs/heads/develop')
@@ -46,7 +66,7 @@ jobs:
 
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0
@@ -96,7 +116,7 @@ jobs:
 
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,31 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [3.1.0] - 2023-10-11
+
+### Changed
+
+- ![OTHER] DeepSelect instead of Select to read MetaData with "." in key
+- ![UI] Modify menus for reference specifications
+
+### Fixed
+
+- ![STAT] Correct deviances in diffuse likelihood
+- ![STAT] Correct covariance of ARMA parameters in models with quasi-unit roots in AR
+- ![UI] Save correctly modified multiprocessing
+- ![UI] Fix non-removable star on data source nodes
+- ![IO] Fix NPE in grid reader when header is null
+
+### Added
+
+- ![STAT] Add Poisson distribution
+- ![OTHER] Serialize High-frequency series (modelling part)
+- ![OTHER] Add auxiliary functions to simplify the use of JD+ from R
+- ![OTHER] Add specifications and auxiliary functions for linear filters
+- ![OTHER] Add default modelling for seasonal adjustment (STL...)
+- ![OTHER] Add handling of time varying trading days
+- ![UI] Add export of SA documents to Excel
+
 ## [3.0.2] - 2023-06-14
 
 ### Changed
@@ -39,7 +64,8 @@ Install instructions are available at https://github.com/jdemetra/jdplus-main#in
 This is the **initial release** of JDemetra+ v3.0.0.  
 [Java SE 17 or later](https://whichjdk.com/) version is required to run it.
 
-[Unreleased]: https://github.com/jdemetra/jd3-main/compare/v3.0.2...HEAD
+[Unreleased]: https://github.com/jdemetra/jd3-main/compare/v3.1.0...HEAD
+[3.1.0]: https://github.com/jdemetra/jd3-main/compare/v3.0.2...v3.1.0
 [3.0.2]: https://github.com/jdemetra/jd3-main/compare/v3.0.1...v3.0.2
 [3.0.1]: https://github.com/jdemetra/jd3-main/compare/v3.0.0...v3.0.1
 [3.0.0]: https://github.com/jdemetra/jd3-main/releases/tag/v3.0.0

diff --git a/jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-api/pom.xml b/jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>jdplus-sa-base-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
     </parent>
 
     <artifactId>jdplus-sa-base-api</artifactId>

diff --git a/...ase/jdplus-sa-base-parent/jdplus-sa-base-api/src/main/java/jdplus/sa/base/api/SaItem.java b/...ase/jdplus-sa-base-parent/jdplus-sa-base-api/src/main/java/jdplus/sa/base/api/SaItem.java
@@ -35,6 +35,7 @@
  */
 @lombok.Value
 @lombok.Builder(builderClassName = "Builder", toBuilder = true)
+@lombok.AllArgsConstructor(access=lombok.AccessLevel.PUBLIC)
 public final class SaItem {
 
     public static final String COMMENT = "comment";
@@ -151,6 +152,17 @@ public SaItem withTs(Ts ts) {
                 .build();
     }
 
+    public SaItem withTsMetaData(Map<String, String> info) {
+        Ts cur = definition.getTs();
+        Ts ncur = cur.toBuilder().clearMeta()
+                .meta(info)
+                .build();
+        SaDefinition ndef = definition.toBuilder()
+                .ts(ncur)
+                .build();
+        return new SaItem(name, ndef, meta, priority, estimation, processed);
+    }
+
     public void accept() {
         synchronized (this) {
             if (estimation == null) {

diff --git a/jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-api/src/main/java/module-info.java b/jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-api/src/main/java/module-info.java
@@ -15,7 +15,6 @@
     exports jdplus.sa.base.api.benchmarking;
     exports jdplus.sa.base.api.diagnostics;
     exports jdplus.sa.base.api.extractors;
-    exports jdplus.sa.base.api.modelling;
     exports jdplus.sa.base.api;
 
     uses SaProcessingFactory;

diff --git a/jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-core/pom.xml b/jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>jdplus-sa-base-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
     </parent>
 
     <artifactId>jdplus-sa-base-core</artifactId>

diff --git a/...e-core/src/main/java/jdplus/sa/base/core/regarima/AutomaticTradingDaysRegressionTest.java b/...e-core/src/main/java/jdplus/sa/base/core/regarima/AutomaticTradingDaysRegressionTest.java
@@ -142,7 +142,7 @@ private ModelDescription createTestModel(RegSarimaModelling context, ITradingDay
         tmp.setAirline(true);
         tmp.setMean(true);
         if (td != null) {
-            tmp.addVariable(Variable.variable("td", td, ModelBuilder.calendarAMI));
+            tmp.addVariable(Variable.variable("td", td,  ModelBuilder.calendarAMI));
         }
         if (lp != null) {
             tmp.addVariable(Variable.variable("lp", lp, ModelBuilder.calendarAMI));