Skip to content

Commit 3d2aa36

Browse files
authored
Merge branch 'main' into feat-746
2 parents 627b70e + a88534a commit 3d2aa36

191 files changed

Lines changed: 6025 additions & 1301 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/skills/fastexcel-to-fesod/SKILL.md

Lines changed: 411 additions & 0 deletions
Large diffs are not rendered by default.

.github/workflows/ci-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
run: pnpm build
5858

5959
- name: Lint markdown files
60-
uses: DavidAnson/markdownlint-cli2-action@992badcdf24e3b8eb7e87ff9287fe931bcb00c6e
60+
uses: DavidAnson/markdownlint-cli2-action@07035fd053f7be764496c0f8d8f9f41f98305101
6161
with:
6262
globs: 'website/**/*.md'
6363
config: 'website/.markdownlint-cli2.jsonc'

DISCLAIMER

Lines changed: 0 additions & 10 deletions
This file was deleted.

DISCLAIMER-WIP

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
Apache Fesod (incubating) is an effort undergoing incubation at The Apache
2+
Software Foundation (ASF), sponsored by the Apache Incubator PMC.
3+
4+
Incubation is required of all newly accepted projects until a further review
5+
indicates that the infrastructure, communications, and decision making process
6+
have stabilized in a manner consistent with other successful ASF projects.
7+
8+
While incubation status is not necessarily a reflection of the completeness
9+
or stability of the code, it does indicate that the project has yet to be
10+
fully endorsed by the ASF.
11+
12+
Some of the incubating project’s releases may not be fully compliant with ASF
13+
policy. For example, releases may have incomplete or un-reviewed licensing
14+
conditions. What follows is a list of issues the project is currently aware of
15+
(this list is likely to be incomplete):
16+
17+
1. IP Clearance and license header updates for legacy code derived from Alibaba
18+
EasyExcel are currently in progress.
19+
20+
If you are planning to incorporate this work into your product/project,please be
21+
aware that you will need to conduct a thorough licensing review to determine the
22+
overall implications of including this work.
23+
24+
For the current status of this project through the Apache Incubator,
25+
visit: https://incubator.apache.org/projects/fesod.html

NOTICE

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
Apache Fesod (Incubating)
2-
Copyright 2025 The Apache Software Foundation
2+
Copyright 2025-2026 The Apache Software Foundation
33

44
This product includes software developed at
55
The Apache Software Foundation (http://www.apache.org/).
6+
7+
This product contains significant parts that were originally based on software
8+
from Alibaba Group (EasyExcel <https://github.com/alibaba/easyexcel>) under
9+
the Apache License, Version 2.0 License.
10+
11+
Copyright (C) 2022-2024 Alibaba Group Holding Ltd.
612
-----------------------------------------------------------------------
713
Apache Maven Wrapper
814
Copyright 2013-2022 The Apache Software Foundation

README.md

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,30 +29,32 @@
2929
[![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/apache/fesod/ci.yml?style=flat-square&logo=github)](https://github.com/apache/fesod/actions/workflows/ci.yml)
3030
[![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/apache/fesod/nightly.yml?style=flat-square&logo=github&label=nightly)](https://github.com/apache/fesod/actions/workflows/nightly.yml)
3131
[![GitHub License](https://img.shields.io/github/license/apache/fesod?logo=apache&style=flat-square)](https://github.com/apache/fesod/blob/main/LICENSE)
32-
![Maven Central Version](https://img.shields.io/maven-central/v/org.apache.fesod/fesod?logo=apachemaven&style=flat-square)
32+
![Maven Central Version](https://img.shields.io/maven-central/v/org.apache.fesod/fesod-sheet?logo=apachemaven&style=flat-square)
3333
[![Document](https://img.shields.io/github/actions/workflow/status/apache/fesod/ci.yml?style=flat-square&logo=read-the-docs&label=Document)](https://fesod.apache.org/)
3434
[![DeepWiki](https://img.shields.io/badge/DeepWiki-apache%2Ffesod-blue.svg?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAyCAYAAAAnWDnqAAAAAXNSR0IArs4c6QAAA05JREFUaEPtmUtyEzEQhtWTQyQLHNak2AB7ZnyXZMEjXMGeK/AIi+QuHrMnbChYY7MIh8g01fJoopFb0uhhEqqcbWTp06/uv1saEDv4O3n3dV60RfP947Mm9/SQc0ICFQgzfc4CYZoTPAswgSJCCUJUnAAoRHOAUOcATwbmVLWdGoH//PB8mnKqScAhsD0kYP3j/Yt5LPQe2KvcXmGvRHcDnpxfL2zOYJ1mFwrryWTz0advv1Ut4CJgf5uhDuDj5eUcAUoahrdY/56ebRWeraTjMt/00Sh3UDtjgHtQNHwcRGOC98BJEAEymycmYcWwOprTgcB6VZ5JK5TAJ+fXGLBm3FDAmn6oPPjR4rKCAoJCal2eAiQp2x0vxTPB3ALO2CRkwmDy5WohzBDwSEFKRwPbknEggCPB/imwrycgxX2NzoMCHhPkDwqYMr9tRcP5qNrMZHkVnOjRMWwLCcr8ohBVb1OMjxLwGCvjTikrsBOiA6fNyCrm8V1rP93iVPpwaE+gO0SsWmPiXB+jikdf6SizrT5qKasx5j8ABbHpFTx+vFXp9EnYQmLx02h1QTTrl6eDqxLnGjporxl3NL3agEvXdT0WmEost648sQOYAeJS9Q7bfUVoMGnjo4AZdUMQku50McDcMWcBPvr0SzbTAFDfvJqwLzgxwATnCgnp4wDl6Aa+Ax283gghmj+vj7feE2KBBRMW3FzOpLOADl0Isb5587h/U4gGvkt5v60Z1VLG8BhYjbzRwyQZemwAd6cCR5/XFWLYZRIMpX39AR0tjaGGiGzLVyhse5C9RKC6ai42ppWPKiBagOvaYk8lO7DajerabOZP46Lby5wKjw1HCRx7p9sVMOWGzb/vA1hwiWc6jm3MvQDTogQkiqIhJV0nBQBTU+3okKCFDy9WwferkHjtxib7t3xIUQtHxnIwtx4mpg26/HfwVNVDb4oI9RHmx5WGelRVlrtiw43zboCLaxv46AZeB3IlTkwouebTr1y2NjSpHz68WNFjHvupy3q8TFn3Hos2IAk4Ju5dCo8B3wP7VPr/FGaKiG+T+v+TQqIrOqMTL1VdWV1DdmcbO8KXBz6esmYWYKPwDL5b5FA1a0hwapHiom0r/cKaoqr+27/XcrS5UwSMbQAAAABJRU5ErkJggg==)](https://deepwiki.com/apache/fesod)
3535

3636
**Home: [fesod.apache.org](https://fesod.apache.org)**
37-
**Email: <a href="mailto:dev-subscribe@fesod.apache.org">Mail to `dev-subscribe@fesod.apache.org`</a> to subscribe mailing lists**
38-
37+
**Email: <a href="mailto:dev-subscribe@fesod.apache.org">Mail to `dev-subscribe@fesod.apache.org`</a> to subscribe
38+
mailing lists**
3939

4040
## Introduction
4141

42-
**Apache Fesod (Incubating)** is a high-performance and memory-efficient Java library for reading and writing spreadsheet
42+
**Apache Fesod (Incubating)** is a high-performance and memory-efficient Java library for reading and writing
43+
spreadsheet
4344
files, designed to simplify development and ensure reliability.
4445

4546
Apache Fesod (Incubating) can provide developers and enterprises with great freedom and flexibility. We plan to
4647
introduce more new features in the future to continually enhance user experience and tool usability. Apache Fesod (
4748
Incubating) is committed to being your best choice for handling spreadsheet files.
4849

49-
The name fesod(pronounced `/ˈfɛsɒd/`), an acronym for "fast easy spreadsheet and other documents" expresses the
50-
project's origin, background and vision.
50+
The name fesod (pronounced `/ˈfɛsɒd/`), an acronym for "fast easy spreadsheet and other documents," expresses the
51+
project's origin, background, and vision.
5152

5253
### Features
5354

5455
- **High-performance Reading and Writing**: Apache Fesod (Incubating) focuses on performance optimization, capable of
55-
efficiently handling large-scale spreadsheet data. Compared to some traditional spreadsheet processing libraries, it can
56+
efficiently handling large-scale spreadsheet data. Compared to some traditional spreadsheet processing libraries, it
57+
can
5658
significantly reduce memory consumption.
5759
- **Simplicity and Ease of Use**: The library offers a simple and intuitive API, allowing developers to easily integrate
5860
it into projects, whether for simple spreadsheet operations or complex data processing.
@@ -67,12 +69,7 @@ strongly recommend using the latest version of Apache Fesod (Incubating), as per
6769
new features in the latest version will enhance your experience.
6870

6971
> Currently, Apache Fesod (Incubating) uses POI as its underlying package. If your project already includes POI-related
70-
> components, you
71-
> will need to manually exclude POI-related jar files.
72-
73-
74-
> We are currently preparing for the first release under the Apache Incubator. Current releases were non-Apache
75-
> releases. You can see previous version in this link: https://fesod.apache.org/docs/quickstart/guide/
72+
> components, you will need to manually exclude POI-related jar files.
7673
7774
### Maven
7875

@@ -82,7 +79,7 @@ If you are using Maven for project building, add the following configuration in
8279

8380
<dependency>
8481
<groupId>org.apache.fesod</groupId>
85-
<artifactId>fesod</artifactId>
82+
<artifactId>fesod-sheet</artifactId>
8683
<version>version</version>
8784
</dependency>
8885
```
@@ -93,7 +90,7 @@ If you are using Gradle for project building, add the following configuration in
9390

9491
```gradle
9592
dependencies {
96-
implementation 'org.apache.fesod:fesod:version'
93+
implementation 'org.apache.fesod:fesod-sheet:version'
9794
}
9895
```
9996

README_CN.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
[![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/apache/fesod/ci.yml?style=flat-square&logo=github)](https://github.com/apache/fesod/actions/workflows/ci.yml)
3030
[![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/apache/fesod/nightly.yml?style=flat-square&logo=github&label=nightly)](https://github.com/apache/fesod/actions/workflows/nightly.yml)
3131
[![GitHub License](https://img.shields.io/github/license/apache/fesod?logo=apache&style=flat-square)](https://github.com/apache/fesod/blob/main/LICENSE)
32-
![Maven Central Version](https://img.shields.io/maven-central/v/org.apache.fesod/fesod?logo=apachemaven&style=flat-square)
32+
![Maven Central Version](https://img.shields.io/maven-central/v/org.apache.fesod/fesod-sheet?logo=apachemaven&style=flat-square)
3333
[![Document](https://img.shields.io/github/actions/workflow/status/apache/fesod/ci.yml?style=flat-square&logo=read-the-docs&label=Document)](https://fesod.apache.org/)
3434
[![DeepWiki](https://img.shields.io/badge/DeepWiki-apache%2Ffesod-blue.svg?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAyCAYAAAAnWDnqAAAAAXNSR0IArs4c6QAAA05JREFUaEPtmUtyEzEQhtWTQyQLHNak2AB7ZnyXZMEjXMGeK/AIi+QuHrMnbChYY7MIh8g01fJoopFb0uhhEqqcbWTp06/uv1saEDv4O3n3dV60RfP947Mm9/SQc0ICFQgzfc4CYZoTPAswgSJCCUJUnAAoRHOAUOcATwbmVLWdGoH//PB8mnKqScAhsD0kYP3j/Yt5LPQe2KvcXmGvRHcDnpxfL2zOYJ1mFwrryWTz0advv1Ut4CJgf5uhDuDj5eUcAUoahrdY/56ebRWeraTjMt/00Sh3UDtjgHtQNHwcRGOC98BJEAEymycmYcWwOprTgcB6VZ5JK5TAJ+fXGLBm3FDAmn6oPPjR4rKCAoJCal2eAiQp2x0vxTPB3ALO2CRkwmDy5WohzBDwSEFKRwPbknEggCPB/imwrycgxX2NzoMCHhPkDwqYMr9tRcP5qNrMZHkVnOjRMWwLCcr8ohBVb1OMjxLwGCvjTikrsBOiA6fNyCrm8V1rP93iVPpwaE+gO0SsWmPiXB+jikdf6SizrT5qKasx5j8ABbHpFTx+vFXp9EnYQmLx02h1QTTrl6eDqxLnGjporxl3NL3agEvXdT0WmEost648sQOYAeJS9Q7bfUVoMGnjo4AZdUMQku50McDcMWcBPvr0SzbTAFDfvJqwLzgxwATnCgnp4wDl6Aa+Ax283gghmj+vj7feE2KBBRMW3FzOpLOADl0Isb5587h/U4gGvkt5v60Z1VLG8BhYjbzRwyQZemwAd6cCR5/XFWLYZRIMpX39AR0tjaGGiGzLVyhse5C9RKC6ai42ppWPKiBagOvaYk8lO7DajerabOZP46Lby5wKjw1HCRx7p9sVMOWGzb/vA1hwiWc6jm3MvQDTogQkiqIhJV0nBQBTU+3okKCFDy9WwferkHjtxib7t3xIUQtHxnIwtx4mpg26/HfwVNVDb4oI9RHmx5WGelRVlrtiw43zboCLaxv46AZeB3IlTkwouebTr1y2NjSpHz68WNFjHvupy3q8TFn3Hos2IAk4Ju5dCo8B3wP7VPr/FGaKiG+T+v+TQqIrOqMTL1VdWV1DdmcbO8KXBz6esmYWYKPwDL5b5FA1a0hwapHiom0r/cKaoqr+27/XcrS5UwSMbQAAAABJRU5ErkJggg==)](https://deepwiki.com/apache/fesod)
3535

@@ -56,17 +56,14 @@ Apache Fesod (Incubating) 需要 **Java 1.8** 或更高版本。建议使用最
5656

5757
> 目前,Apache Fesod (Incubating) 使用 POI 作为底层包。如果您的项目已包含 POI 相关组件,您需要手动排除 POI 相关的 jar 文件。
5858
59-
> 我们目前正在准备 Apache 孵化器下的第一个版本。当前的版本都是非 Apache 版本。您可以通过此链接查看之前的版本:https://fesod.apache.org/docs/quickstart/guide/
60-
6159
### Maven
6260

6361
如果使用 Maven 进行项目构建,请在 `pom.xml` 文件中添加以下配置:
6462

6563
```xml
66-
6764
<dependency>
6865
<groupId>org.apache.fesod</groupId>
69-
<artifactId>fesod</artifactId>
66+
<artifactId>fesod-sheet</artifactId>
7067
<version>version</version>
7168
</dependency>
7269
```
@@ -77,7 +74,7 @@ Apache Fesod (Incubating) 需要 **Java 1.8** 或更高版本。建议使用最
7774

7875
```gradle
7976
dependencies {
80-
implementation 'org.apache.fesod:fesod:version'
77+
implementation 'org.apache.fesod:fesod-sheet:version'
8178
}
8279
```
8380

fesod-bom/pom.xml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
under the License.
2020
2121
-->
22-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
22+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2324
<modelVersion>4.0.0</modelVersion>
2425

2526
<parent>
@@ -46,4 +47,23 @@
4647
</dependency>
4748
</dependencies>
4849
</dependencyManagement>
50+
51+
<build>
52+
<plugins>
53+
<plugin>
54+
<groupId>org.codehaus.mojo</groupId>
55+
<artifactId>flatten-maven-plugin</artifactId>
56+
<configuration>
57+
<flattenMode>bom</flattenMode>
58+
<pomElements>
59+
<parent>remove</parent>
60+
<repositories>remove</repositories>
61+
<dependencies>remove</dependencies>
62+
<properties>remove</properties>
63+
<dependencyManagement>interpolate</dependencyManagement>
64+
</pomElements>
65+
</configuration>
66+
</plugin>
67+
</plugins>
68+
</build>
4969
</project>

fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/demo/read/CellDataDemoHeadDataListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import com.alibaba.fastjson2.JSON;
2323
import java.util.List;
2424
import lombok.extern.slf4j.Slf4j;
25+
import org.apache.fesod.common.util.ListUtils;
2526
import org.apache.fesod.sheet.context.AnalysisContext;
2627
import org.apache.fesod.sheet.read.listener.ReadListener;
27-
import org.apache.fesod.sheet.util.ListUtils;
2828

2929
/**
3030
* Read header

fesod-examples/fesod-sheet-examples/src/test/java/org/apache/fesod/sheet/demo/read/ConverterDataListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import com.alibaba.fastjson2.JSON;
2323
import java.util.List;
2424
import lombok.extern.slf4j.Slf4j;
25+
import org.apache.fesod.common.util.ListUtils;
2526
import org.apache.fesod.sheet.context.AnalysisContext;
2627
import org.apache.fesod.sheet.read.listener.ReadListener;
27-
import org.apache.fesod.sheet.util.ListUtils;
2828

2929
/**
3030
* Template data reading class

0 commit comments

Comments
 (0)