Merge branch 'develop'

nbbrd · Oct 4, 2024 · ba09bee · ba09bee
2 parents 3e1cd19 + 97891d5
commit ba09bee
Show file tree

Hide file tree

Showing 18 changed files with 228 additions and 70 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,6 +7,9 @@ updates:
       interval: "weekly"
       day: "saturday"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "eu.europa.ec.joinup.sat:*"
+      - dependency-name: "org.netbeans.api:*"
   - package-ecosystem: "github-actions"
     target-branch: "develop"
     directory: "/"

diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml
@@ -0,0 +1,40 @@
+name: Check links in documentation
+
+on:
+  push:
+    paths:
+      - '.github/workflows/check-links.yml'
+      - 'lychee.toml'
+      - '**/*.md'
+  schedule:
+    # Run on the first of each month at 9:00 AM
+    - cron: "0 9 1 * *"
+  workflow_dispatch:
+
+concurrency:
+  group: "${{ github.workflow }}-${{ github.head_ref }}"
+  cancel-in-progress: true
+
+jobs:
+  lychee:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+          fetch-depth: 0
+
+      - name: Restore lychee cache
+        uses: actions/cache@v4
+        with:
+          path: .lycheecache
+          key: cache-lychee-${{ github.sha }}
+          restore-keys: cache-lychee-
+
+      - name: Check links
+        id: lychee
+        uses: lycheeverse/lychee-action@v1.10.0
+        with:
+          fail: true
+          args: --max-concurrency 1 --cache --no-progress --exclude-all-private './**/*.md'
diff --git a/.github/workflows/heylogs.yml b/.github/workflows/heylogs.yml
@@ -0,0 +1,33 @@
+name: Heylogs
+
+on: [ push ]
+
+jobs:
+  badge-job:
+    if: startsWith(github.repository, 'nbbrd/') && startsWith(github.ref, 'refs/heads/develop')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 21
+          cache: 'maven'
+
+      - name: Scan changelog
+        run: mvn -B -ntp -U com.github.nbbrd.heylogs:heylogs-maven-plugin::scan -Dheylogs.output.file=scan.json -Dheylogs.format.id=json
+
+      - name: Create badges endpoint json
+        run: |
+          mkdir heylogs
+          jq '{schemaVersion: 1, label: "unreleased changes", message: "#\(.[0].summary.unreleasedChanges)", color: "E05735", logoColor: "white", namedLogo: "keepachangelog"}' scan.json > heylogs/unreleased-changes.json
+          
+      - name: Deploy badges endpoint json
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_branch: badges
+          publish_dir: ./heylogs
diff --git a/.github/workflows/java-ea-maven.yml b/.github/workflows/java-ea-maven.yml
@@ -11,8 +11,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 20 ]
-        os: [ ubuntu-latest ]
+        java: [ 21 ]
+        os: [ ubuntu-latest, macos-latest ]
 
     name: JDK${{ matrix.java }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
@@ -25,7 +25,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
@@ -34,4 +34,4 @@ jobs:
       - name: Build and (headless) test with Maven
         uses: smithki/xvfb-action@v1.1.2
         with:
-          run: mvn -U -B -ntp package
+          run: mvn -U -B -ntp verify
diff --git a/.github/workflows/java-maven.yml b/.github/workflows/java-maven.yml
@@ -1,15 +1,15 @@
 name: Java8+ with Maven
 
-on: [ push, pull_request ]
+on: [ push, pull_request, workflow_dispatch ]
 
 jobs:
   build-and-test-job:
     if: github.event_name == 'pull_request' || startsWith(github.ref, 'refs/heads/develop') || startsWith(github.ref, 'refs/tags/v')
     strategy:
       fail-fast: false
       matrix:
-        java: [ 17 ]
-        os: [ ubuntu-latest, macOS-latest, windows-latest ]
+        java: [ 21 ]
+        os: [ ubuntu-latest, macos-13, windows-latest ]
 
     name: JDK${{ matrix.java }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
@@ -22,19 +22,23 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
           cache: 'maven'
 
       - name: Pre-download dependencies with Maven
-        run: mvn -U -B -ntp dependency:go-offline
+        uses: nick-fields/retry@v3
+        with:
+          command: mvn -U -B -ntp dependency:go-offline
+          max_attempts: 3
+          timeout_minutes: 5
 
       - name: Build and (headless) test with Maven
         uses: smithki/xvfb-action@v1.1.2
         with:
-          run: mvn -U -B -ntp package
+          run: mvn -U -B -ntp verify
 
   auto-merge-job:
     needs: build-and-test-job
@@ -48,7 +52,11 @@ jobs:
 
     steps:
       - name: Merge PR
-        run: gh pr merge --auto --rebase "$PR_URL"
+        uses: nick-fields/retry@v3
+        with:
+          command: gh pr merge --auto --rebase "$PR_URL"
+          max_attempts: 3
+          timeout_minutes: 5
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
@@ -58,7 +66,7 @@ jobs:
     if: startsWith(github.repository, 'nbbrd/') && startsWith(github.ref, 'refs/heads/develop')
     strategy:
       matrix:
-        java: [ 17 ]
+        java: [ 21 ]
         os: [ ubuntu-latest ]
 
     name: Snapshot on develop
@@ -72,7 +80,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
@@ -96,7 +104,7 @@ jobs:
 
       - name: Upload JReleaser output
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: assets-snapshot-log
           path: |
@@ -108,7 +116,7 @@ jobs:
     if: startsWith(github.repository, 'nbbrd/') && startsWith(github.ref, 'refs/tags/v')
     strategy:
       matrix:
-        java: [ 17 ]
+        java: [ 21 ]
         os: [ ubuntu-latest ]
 
     name: Release on tag
@@ -122,7 +130,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
@@ -148,7 +156,7 @@ jobs:
 
       - name: Upload JReleaser output
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: assets-release-log
           path: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,23 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [3.2.0] - 2024-10-04
+
+This is a feature release of SDMX extensions for JDemetra+ v3.  
+[JDemetra+ v3.1.1 or later](https://github.com/jdemetra/jdplus-main) version is required to run it.
+
+### Added
+
+- Add logging of events
+
+### Fixed
+
+- Fix sources file property in configuration
+
+### Changed
+
+- Bump sdmx-dl from 3.0.0-beta.12 to [3.0.0-beta.13](https://github.com/nbbrd/sdmx-dl/releases/tag/v3.0.0-beta.13)
+
 ## [3.1.0] - 2023-10-16
 
 This is a feature release of SDMX extensions for JDemetra+ v3.  
@@ -30,6 +47,7 @@ This is a feature release of SDMX extensions for JDemetra+ v3.
 This is the **initial release** of SDMX extensions for JDemetra+ v3.  
 [JDemetra+ v3.0.2 or later](https://github.com/jdemetra/jdplus-main) version is required to run it.
 
-[Unreleased]: https://github.com/nbbrd/jdplus-sdmx/compare/v3.1.0...HEAD
+[Unreleased]: https://github.com/nbbrd/jdplus-sdmx/compare/v3.2.0...HEAD
+[3.2.0]: https://github.com/nbbrd/jdplus-sdmx/compare/v3.1.0...v3.2.0
 [3.1.0]: https://github.com/nbbrd/jdplus-sdmx/compare/v3.0.0...v3.1.0
 [3.0.0]: https://github.com/nbbrd/jdplus-sdmx/releases/tag/v3.0.0
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 # SDMX extensions for JDemetra+ v3
 
 [![Download](https://img.shields.io/github/release/nbbrd/jdplus-sdmx.svg)](https://github.com/nbbrd/jdplus-sdmx/releases/latest)
+[![Changes](https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fnbbrd%2Fjdplus-sdmx%2Fbadges%2Funreleased-changes.json)](https://github.com/nbbrd/jdplus-sdmx/blob/develop/CHANGELOG.md)
 
 This plugin provides time series from [SDMX](https://sdmx.org/) to [JDemetra+ v3](https://github.com/jdemetra/jdplus-main) by querying web services and parsing local files.
diff --git a/jdplus-sdmx-base/jdplus-sdmx-base-parent/jdplus-sdmx-base-api/pom.xml b/jdplus-sdmx-base/jdplus-sdmx-base-parent/jdplus-sdmx-base-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.github.nbbrd.jdplus-sdmx</groupId>
         <artifactId>jdplus-sdmx-base-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
     </parent>
 
     <artifactId>jdplus-sdmx-base-api</artifactId>

diff --git a/jdplus-sdmx-base/jdplus-sdmx-base-parent/pom.xml b/jdplus-sdmx-base/jdplus-sdmx-base-parent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.nbbrd.jdplus-sdmx</groupId>
         <artifactId>jdplus-sdmx-base</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
     </parent>
 
     <artifactId>jdplus-sdmx-base-parent</artifactId>

diff --git a/jdplus-sdmx-base/pom.xml b/jdplus-sdmx-base/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.nbbrd.jdplus-sdmx</groupId>
         <artifactId>jdplus-sdmx</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
     </parent>
 
     <artifactId>jdplus-sdmx-base</artifactId>

diff --git a/jdplus-sdmx-bom/pom.xml b/jdplus-sdmx-bom/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.github.nbbrd.jdplus-sdmx</groupId>
         <artifactId>jdplus-sdmx</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
     </parent>
 
     <artifactId>jdplus-sdmx-bom</artifactId>
@@ -42,7 +42,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>flatten-maven-plugin</artifactId>
-                <version>1.5.0</version>
+                <version>1.6.0</version>
                 <configuration>
                     <flattenMode>bom</flattenMode>
                     <outputDirectory>${project.build.directory}</outputDirectory>
@@ -89,7 +89,6 @@
                     <plugin>
                         <groupId>org.jreleaser</groupId>
                         <artifactId>jreleaser-maven-plugin</artifactId>
-                        <version>1.8.0</version>
                         <executions>
                             <execution>
                                 <id>release-assets</id>

diff --git a/jdplus-sdmx-cli/jdplus-sdmx-cli-plugin/pom.xml b/jdplus-sdmx-cli/jdplus-sdmx-cli-plugin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.nbbrd.jdplus-sdmx</groupId>
         <artifactId>jdplus-sdmx-cli</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
     </parent>
 
     <artifactId>jdplus-sdmx-cli-plugin</artifactId>

diff --git a/jdplus-sdmx-cli/pom.xml b/jdplus-sdmx-cli/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.nbbrd.jdplus-sdmx</groupId>
         <artifactId>jdplus-sdmx</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
     </parent>
 
     <artifactId>jdplus-sdmx-cli</artifactId>

diff --git a/jdplus-sdmx-desktop/jdplus-sdmx-desktop-plugin/pom.xml b/jdplus-sdmx-desktop/jdplus-sdmx-desktop-plugin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.nbbrd.jdplus-sdmx</groupId>
         <artifactId>jdplus-sdmx-desktop</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
     </parent>
 
     <artifactId>jdplus-sdmx-desktop-plugin</artifactId>
@@ -123,7 +123,7 @@
         <dependency>
             <groupId>com.github.nbbrd.java-desktop-util</groupId>
             <artifactId>java-desktop-util-favicon</artifactId>
-            <version>2.3.0</version>
+            <version>2.4.0</version>
         </dependency>
     </dependencies>
 

diff --git a/...x-desktop/jdplus-sdmx-desktop-plugin/src/main/java/jdplus/sdmx/desktop/plugin/Toggle.java b/...x-desktop/jdplus-sdmx-desktop-plugin/src/main/java/jdplus/sdmx/desktop/plugin/Toggle.java
@@ -7,10 +7,14 @@ public enum Toggle {
     DEFAULT, DISABLE, ENABLE;
 
     public void applyTo(Properties properties, CharSequence key) {
+        applyTo(properties, key, "false", "true");
+    }
+
+    public void applyTo(Properties properties, CharSequence key, String disableValue, String enableValue) {
         switch (this) {
             case DEFAULT -> properties.remove(key.toString());
-            case DISABLE -> properties.setProperty(key.toString(), Boolean.toString(false));
-            case ENABLE -> properties.setProperty(key.toString(), Boolean.toString(true));
+            case DISABLE -> properties.setProperty(key.toString(), disableValue);
+            case ENABLE -> properties.setProperty(key.toString(), enableValue);
         }
     }
 }