Merge branch 'develop'

nbbrd · May 28, 2024 · c121bc8 · c121bc8
2 parents c4e2940 + 7300f67
commit c121bc8
Show file tree

Hide file tree

Showing 20 changed files with 162 additions and 75 deletions.
diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml
@@ -34,7 +34,7 @@ jobs:
 
       - name: Check links
         id: lychee
-        uses: lycheeverse/lychee-action@v1.9.3
+        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/java-ea-maven.yml b/.github/workflows/java-ea-maven.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         java: [ 21 ]
-        os: [ ubuntu-latest ]
+        os: [ ubuntu-latest, macos-latest ]
 
     name: JDK${{ matrix.java }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
@@ -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/java8-maven.yml b/.github/workflows/java8-maven.yml
@@ -9,7 +9,7 @@ jobs:
       fail-fast: false
       matrix:
         java: [ 8, 21 ]
-        os: [ ubuntu-latest, macOS-latest, windows-latest ]
+        os: [ ubuntu-latest, macos-13, windows-latest ]
 
     name: JDK${{ matrix.java }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
@@ -34,7 +34,7 @@ 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
 
   auto-merge-job:
     needs: build-and-test-job

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,17 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [2.5.9] - 2024-05-28
+
+### Fixed
+
+- Fix date parsing in SODS [#470](https://github.com/nbbrd/spreadsheet4j/issues/470)
+
+### Changed
+
+- Bump java-io-util from 0.0.27 to [0.0.28](https://github.com/nbbrd/spreadsheet4j/blob/develop/CHANGELOG.md)
+- Bump fastexcel from 0.16.6 to [0.18.0](https://github.com/dhatim/fastexcel/compare/0.15.7...0.16.6)
+
 ## [2.5.8] - 2024-02-26
 
 ### Changed
@@ -52,7 +63,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 - Bump SODS from [1.5.1 to 1.6.2](https://github.com/miachm/SODS/releases)
 - Bump fastexcel from [0.14.0 to 0.15.7](https://github.com/dhatim/fastexcel/releases)
-- Bump jsoup from [1.15.3 to 1.16.1](https://github.com/jhy/jsoup/blob/master/CHANGES)
+- Bump jsoup from [1.15.3 to 1.16.1](https://github.com/jhy/jsoup/blob/master/CHANGES.md)
 - Remove `spreadsheet-xl` dependency from `spreadsheet-poi`
 
 ## [2.5.2] - 2022-10-28
@@ -172,7 +183,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 - JDK11 cleanup
 
-[Unreleased]: https://github.com/nbbrd/spreadsheet4j/compare/v2.5.8...HEAD
+[Unreleased]: https://github.com/nbbrd/spreadsheet4j/compare/v2.5.9...HEAD
+[2.5.9]: https://github.com/nbbrd/spreadsheet4j/compare/v2.5.8...v2.5.9
 [2.5.8]: https://github.com/nbbrd/spreadsheet4j/compare/v2.5.7...v2.5.8
 [2.5.7]: https://github.com/nbbrd/spreadsheet4j/compare/v2.5.6...v2.5.7
 [2.5.6]: https://github.com/nbbrd/spreadsheet4j/compare/v2.5.5...v2.5.6

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.github.nbbrd.spreadsheet4j</groupId>
     <artifactId>spreadsheet-parent</artifactId>
-    <version>2.5.8</version>
+    <version>2.5.9</version>
     <packaging>pom</packaging>
 
     <name>spreadsheet4j</name>
@@ -38,7 +38,7 @@
     <properties>
         <!-- Java 8+ config -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.build.outputTimestamp>2024-02-26T12:39:59Z</project.build.outputTimestamp>
+        <project.build.outputTimestamp>2024-05-28T08:50:45Z</project.build.outputTimestamp>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
 
@@ -65,7 +65,7 @@
             <dependency>
                 <groupId>org.checkerframework</groupId>
                 <artifactId>checker-qual</artifactId>
-                <version>3.42.0</version>
+                <version>3.43.0</version>
             </dependency>
 
             <!-- test libraries -->
@@ -86,7 +86,7 @@
             <dependency>
                 <groupId>com.github.nbbrd.java-io-util</groupId>
                 <artifactId>java-io-bom</artifactId>
-                <version>0.0.27</version>
+                <version>0.0.28</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -105,22 +105,22 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.12.1</version>
+                    <version>3.13.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.1.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-install-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.1.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.4.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -148,7 +148,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.5.2</version>
+                    <version>3.5.3</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -163,17 +163,17 @@
                 <plugin>
                     <groupId>org.gaul</groupId>
                     <artifactId>modernizer-maven-plugin</artifactId>
-                    <version>2.7.0</version>
+                    <version>2.9.0</version>
                 </plugin>
                 <plugin>
                     <groupId>de.thetaphi</groupId>
                     <artifactId>forbiddenapis</artifactId>
-                    <version>3.6</version>
+                    <version>3.7</version>
                 </plugin>
                 <plugin>
                     <groupId>com.github.nbbrd.heylogs</groupId>
                     <artifactId>heylogs-maven-plugin</artifactId>
-                    <version>0.7.2</version>
+                    <version>0.8.1</version>
                 </plugin>
                 <plugin>
                     <groupId>com.amashchenko.maven.plugin</groupId>
@@ -183,7 +183,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.3.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -203,12 +203,12 @@
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.8.11</version>
+                    <version>0.8.12</version>
                 </plugin>
                 <plugin>
                     <groupId>org.jreleaser</groupId>
                     <artifactId>jreleaser-maven-plugin</artifactId>
-                    <version>1.10.0</version>
+                    <version>1.12.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -301,9 +301,9 @@
                 </property>
             </activation>
             <properties>
-                <lombok.version>1.18.30</lombok.version>
+                <lombok.version>1.18.32</lombok.version>
                 <java-service.version>1.9.0</java-service.version>
-                <java-design.version>1.5.0</java-design.version>
+                <java-design.version>1.5.1</java-design.version>
                 <jmh.version>1.37</jmh.version>
             </properties>
             <dependencyManagement>
@@ -466,12 +466,12 @@
                             <dependency>
                                 <groupId>org.kordamp.maven</groupId>
                                 <artifactId>pomchecker-enforcer-rules</artifactId>
-                                <version>1.10.0</version>
+                                <version>1.11.0</version>
                             </dependency>
                             <dependency>
                                 <groupId>org.codehaus.mojo</groupId>
                                 <artifactId>extra-enforcer-rules</artifactId>
-                                <version>1.7.0</version>
+                                <version>1.8.0</version>
                             </dependency>
                         </dependencies>
                         <executions>

diff --git a/spreadsheet-api/pom.xml b/spreadsheet-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.nbbrd.spreadsheet4j</groupId>
         <artifactId>spreadsheet-parent</artifactId>
-        <version>2.5.8</version>
+        <version>2.5.9</version>
     </parent>
 
     <artifactId>spreadsheet-api</artifactId>

diff --git a/spreadsheet-bom/pom.xml b/spreadsheet-bom/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.nbbrd.spreadsheet4j</groupId>
         <artifactId>spreadsheet-parent</artifactId>
-        <version>2.5.8</version>
+        <version>2.5.9</version>
     </parent>
 
     <artifactId>spreadsheet-bom</artifactId>

diff --git a/spreadsheet-fastexcel/pom.xml b/spreadsheet-fastexcel/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>spreadsheet-parent</artifactId>
         <groupId>com.github.nbbrd.spreadsheet4j</groupId>
-        <version>2.5.8</version>
+        <version>2.5.9</version>
     </parent>
 
     <artifactId>spreadsheet-fastexcel</artifactId>
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.dhatim</groupId>
             <artifactId>fastexcel</artifactId>
-            <version>0.16.6</version>
+            <version>0.18.0</version>
         </dependency>
 
         <!-- test only -->

diff --git a/spreadsheet-html/pom.xml b/spreadsheet-html/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.nbbrd.spreadsheet4j</groupId>
         <artifactId>spreadsheet-parent</artifactId>
-        <version>2.5.8</version>
+        <version>2.5.9</version>
     </parent>
 
     <artifactId>spreadsheet-html</artifactId>

diff --git a/spreadsheet-od/pom.xml b/spreadsheet-od/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.nbbrd.spreadsheet4j</groupId>
         <artifactId>spreadsheet-parent</artifactId>
-        <version>2.5.8</version>
+        <version>2.5.9</version>
     </parent>
 
     <artifactId>spreadsheet-od</artifactId>

diff --git a/spreadsheet-od/src/main/java/ec/util/spreadsheet/od/OdBook.java b/spreadsheet-od/src/main/java/ec/util/spreadsheet/od/OdBook.java
@@ -1,17 +1,17 @@
 /*
  * Copyright 2013 National Bank of Belgium
  *
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved 
+ * Licensed under the EUPL, Version 1.1 or – as soon they will be approved
  * by the European Commission - subsequent versions of the EUPL (the "Licence");
  * You may not use this work except in compliance with the Licence.
  * You may obtain a copy of the Licence at:
  *
  * http://ec.europa.eu/idabc/eupl
  *
- * Unless required by applicable law or agreed to in writing, software 
+ * Unless required by applicable law or agreed to in writing, software
  * distributed under the Licence is distributed on an "AS IS" basis,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and 
+ * See the Licence for the specific language governing permissions and
  * limitations under the Licence.
  */
 package ec.util.spreadsheet.od;
@@ -22,16 +22,12 @@
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
- *
  * @author Philippe Charles
  */
+@lombok.AllArgsConstructor
 final class OdBook extends Book {
 
-    private final SpreadSheet book;
-
-    public OdBook(SpreadSheet book) {
-        this.book = book;
-    }
+    private final @lombok.NonNull SpreadSheet book;
 
     @Override
     public int getSheetCount() {