Merge branch 'main' into issue-571

Author: delei

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Cache Local Maven Repository
         uses: actions/cache@v4
         with:
@@ -23,27 +23,27 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-m2
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           java-version: 21
-          distribution: 'adopt'
+          distribution: 'temurin'
       - name: Check code style
         run: ./mvnw spotless:check
 
   test:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        java: [ 8, 11, 17, 21]
-        distribution: [ 'adopt' ]
+        java: [ 8, 11, 17, 21, 25-ea ]
+        distribution: [ 'temurin' ]
       fail-fast: false
-      max-parallel: 4
+      max-parallel: 5
 
     name: Test JDK ${{ matrix.java }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.java }}
           distribution: ${{ matrix.distribution }}

.github/workflows/codeql-scan.yml

@@ -24,7 +24,7 @@ jobs:
         language: [ 'java' ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3
         with:

.github/workflows/fuzz-tests.yml

@@ -15,13 +15,13 @@ jobs:
       MAVEN_OPTS: '-Xmx2g -Xms2g -Dfile.encoding=UTF-8'
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'maven'
 
       - name: Run fuzz tests (fastexcel module)

.github/workflows/markdownlint.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node.js
         uses: actions/setup-node@v4

.github/workflows/nightly.yml

@@ -11,15 +11,15 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        java: [ 8, 11, 17, 21]
-        distribution: [ 'adopt' ]
+        java: [ 8, 11, 17, 21, 25-ea ]
+        distribution: [ 'temurin' ]
       fail-fast: false
-      max-parallel: 4
+      max-parallel: 5
     name: Test JDK ${{ matrix.java }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.java }}
           distribution: ${{ matrix.distribution }}

README.md

@@ -43,11 +43,12 @@ being your best choice for handling Excel files.
 
 The following table lists the minimum Java language version requirements for each version of the FastExcel library:
 
-| Version | JDK Version Support Range | Notes |
-|---------|:-------------------------:|-------|
-| 1.2.x   |       JDK8 - JDK21        |       |
-| 1.1.x   |       JDK8 - JDK21        |       |
-| 1.0.x   |       JDK8 - JDK21        |       |
+| Version  | JDK Version Support Range | Notes |
+|----------|:-------------------------:|-------|
+| 1.3.x    |       JDK8 - JDK25        |       |
+| 1.2.x    |       JDK8 - JDK21        |       |
+| 1.1.x    |       JDK8 - JDK21        |       |
+| 1.0.x    |       JDK8 - JDK21        |       |
 
 We strongly recommend using the latest version of FastExcel, as performance optimizations, bug fixes, and new features
 in the latest version will enhance your experience.
@@ -92,12 +93,12 @@ Below is an example of reading an Excel document:
 ```java
 // Implement the ReadListener interface to set up operations for reading data
 public class DemoDataListener implements ReadListener<DemoData> {
-    
+
     @Override
     public void invoke(DemoData data, AnalysisContext context) {
         System.out.println("Parsed a data entry" + JSON.toJSONString(data));
     }
-    
+
     @Override
     public void doAfterAllAnalysed(AnalysisContext context) {
         System.out.println("All data parsed!");
@@ -118,16 +119,16 @@ Below is a simple example of creating an Excel document:
 ```java
 // Sample data class
 public class DemoData {
-    
+
     @ExcelProperty("String Title")
     private String string;
-    
+
     @ExcelProperty("Date Title")
     private Date date;
-    
+
     @ExcelProperty("Number Title")
     private Double doubleData;
-    
+
     @ExcelIgnore
     private String ignore;
 }

README_JP.md

@@ -38,9 +38,12 @@ FastExcelは常にフリーでオープンソースであり、ビジネスに
 
 以下の表は、各バージョンのFastExcel基礎ライブラリのJava言語バージョンの最低要件を一覧にしたものです：
 
-| バージョン  | JDKバージョンサポート範囲 | 備考 |
-|--------|:--------------:|----|
-| 1.0.0+ |  JDK8 - JDK21  |    |
+| バージョン    |  JDKバージョンサポート範囲  | 備考           |
+|----------|:----------------:|--------------|
+| 1.3.x    |   JDK8 - JDK25   |              |
+| 1.2.x    |   JDK8 - JDK21   |              |
+| 1.1.x    |   JDK8 - JDK21   |              |
+| 1.0.x    |   JDK8 - JDK21   |              |
 
 最新のFastExcelバージョンを使用することを強くお勧めします。最新バージョンのパフォーマンス最適化、バグ修正、および新機能は、使用の利便性を向上させます。
 
@@ -82,12 +85,12 @@ dependencies {
 ```java
 // ReadListenerインターフェースを実装してデータを読む操作を設定します
 public class DemoDataListener implements ReadListener<DemoData> {
-    
+
     @Override
     public void invoke(DemoData data, AnalysisContext context) {
         System.out.println("データエントリを解析しました" + JSON.toJSONString(data));
     }
-    
+
     @Override
     public void doAfterAllAnalysed(AnalysisContext context) {
         System.out.println("すべてのデータの解析が完了しました！");
@@ -108,16 +111,16 @@ public static void main(String[] args) {
 ```java
 // サンプルデータクラス
 public class DemoData {
-    
+
     @ExcelProperty("文字列タイトル")
     private String string;
-    
+
     @ExcelProperty("日付タイトル")
     private Date date;
-    
+
     @ExcelProperty("数字タイトル")
     private Double doubleData;
-    
+
     @ExcelIgnore
     private String ignore;
 }

README_ZH.md

@@ -40,6 +40,7 @@ Excel 文件的最佳选择。
 
 | 版本    |  jdk版本支持范围   | 备注 |
 |-------|:------------:|----|
+| 1.3.x | jdk8 - jdk25 |    |
 | 1.2.x | jdk8 - jdk21 |    |
 | 1.1.x | jdk8 - jdk21 |    |
 | 1.0.x | jdk8 - jdk21 |    |
@@ -86,12 +87,12 @@ dependencies {
 ```java
 // 实现 ReadListener 接口，设置读取数据的操作
 public class DemoDataListener implements ReadListener<DemoData> {
-    
+
     @Override
     public void invoke(DemoData data, AnalysisContext context) {
         System.out.println("解析到一条数据" + JSON.toJSONString(data));
     }
-    
+
     @Override
     public void doAfterAllAnalysed(AnalysisContext context) {
         System.out.println("所有数据解析完成！");
@@ -112,16 +113,16 @@ public static void main(String[] args) {
 ```java
 // 示例数据类
 public class DemoData {
-    
+
     @ExcelProperty("字符串标题")
     private String string;
-    
+
     @ExcelProperty("日期标题")
     private Date date;
-    
+
     @ExcelProperty("数字标题")
     private Double doubleData;
-    
+
     @ExcelIgnore
     private String ignore;
 }

pom.xml

@@ -28,6 +28,7 @@
         <java.version>1.8</java.version>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
+        <maven-compiler-plugin>3.14.0</maven-compiler-plugin>
         <maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
         <gpg.skip>true</gpg.skip>
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -37,7 +38,7 @@
         <ehcache.version>3.9.11</ehcache.version>
         <commons-io.version>2.16.1</commons-io.version>
         <slf4j-api.version>1.7.36</slf4j-api.version>
-        <lombok.version>1.18.32</lombok.version>
+        <lombok.version>1.18.42</lombok.version>
         <spring-core.version>5.3.37</spring-core.version>
         <fastjson2.version>2.0.58</fastjson2.version>
         <spring-boot-starter-web.version>2.7.18</spring-boot-starter-web.version>
@@ -246,7 +247,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
+                    <version>${maven-compiler-plugin}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

website/docs/quickstart/guide.md

@@ -11,6 +11,7 @@ The following table lists the minimum Java language version requirements for eac
 
 | Version | JDK Version Support Range | Notes |
 |---------|---------------------------|-------|
+| 1.3.x   | JDK8 - JDK25              |       |
 | 1.2.x   | JDK8 - JDK21              |       |
 | 1.1.x   | JDK8 - JDK21              |       |
 | 1.0.x   | JDK8 - JDK21              |       |
@@ -48,4 +49,4 @@ If you are using Gradle for project building, add the following configuration in
 dependencies {
     implementation 'cn.idev.excel:fastexcel:version'
 }
-```
+```