Skip to content

Commit bde6ae3

Browse files
authored
Merge branch 'main' into fix/support-shared-formulas
2 parents 3a240dc + 945b543 commit bde6ae3

File tree

15 files changed

+435
-74
lines changed

15 files changed

+435
-74
lines changed

.github/workflows/ci-docs.yml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
name: Documentation CI
19+
20+
on:
21+
pull_request:
22+
paths:
23+
- 'website/**'
24+
25+
jobs:
26+
build-and-lint:
27+
runs-on: ubuntu-latest
28+
steps:
29+
- name: Checkout code
30+
uses: actions/checkout@v5
31+
32+
- name: Setup pnpm
33+
uses: pnpm/action-setup@v4
34+
with:
35+
version: 8
36+
run_install: false
37+
38+
- name: Setup Node.js
39+
uses: actions/setup-node@v4
40+
with:
41+
node-version: '20'
42+
43+
- name: Enable corepack
44+
working-directory: website
45+
run: npm i -g --force corepack && corepack enable
46+
47+
- name: Install dependencies
48+
working-directory: website
49+
run: pnpm install
50+
51+
- name: Build website
52+
working-directory: website
53+
run: pnpm build
54+
55+
- name: Lint markdown files
56+
uses: DavidAnson/markdownlint-cli2-action@992badcdf24e3b8eb7e87ff9287fe931bcb00c6e
57+
with:
58+
globs: 'website/**/*.md'
59+
config: 'website/.markdownlint-cli2.jsonc'

.github/workflows/ci.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,18 @@ name: Java CI
2020
on:
2121
pull_request:
2222
branches: [ main ]
23+
paths-ignore:
24+
- 'website/**'
25+
- '**.md'
26+
- 'LICENSE'
27+
- 'NOTICE'
2328
push:
2429
branches: [ main ]
30+
paths-ignore:
31+
- 'website/**'
32+
- '**.md'
33+
- 'LICENSE'
34+
- 'NOTICE'
2535

2636
permissions:
2737
checks: write
@@ -32,8 +42,6 @@ jobs:
3242
runs-on: ubuntu-latest
3343
steps:
3444
- uses: actions/checkout@v5
35-
- name: Check License Header
36-
uses: korandoru/hawkeye@v6
3745
- name: Cache Local Maven Repository
3846
uses: actions/cache@v4
3947
with:
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
name: Check License Header
19+
20+
on: [ push, pull_request ]
21+
22+
jobs:
23+
license:
24+
runs-on: ubuntu-latest
25+
steps:
26+
- uses: actions/checkout@v5
27+
- name: Check License Header
28+
uses: korandoru/hawkeye@v6

.github/workflows/markdownlint.yml

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

DISCLAIMER

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
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.

NOTICE

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Apache Fesod (Incubating)
2+
Copyright 2025 The Apache Software Foundation
3+
4+
This product includes software developed at
5+
The Apache Software Foundation (http://www.apache.org/).

fesod/src/main/java/org/apache/fesod/sheet/metadata/csv/CsvCellStyle.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,20 @@
1919

2020
package org.apache.fesod.sheet.metadata.csv;
2121

22+
import java.util.EnumMap;
2223
import lombok.EqualsAndHashCode;
2324
import lombok.Getter;
2425
import lombok.Setter;
2526
import org.apache.fesod.sheet.metadata.data.DataFormatData;
2627
import org.apache.poi.ss.usermodel.BorderStyle;
28+
import org.apache.poi.ss.usermodel.CellPropertyType;
2729
import org.apache.poi.ss.usermodel.CellStyle;
2830
import org.apache.poi.ss.usermodel.Color;
2931
import org.apache.poi.ss.usermodel.FillPatternType;
3032
import org.apache.poi.ss.usermodel.Font;
3133
import org.apache.poi.ss.usermodel.HorizontalAlignment;
3234
import org.apache.poi.ss.usermodel.VerticalAlignment;
35+
import org.apache.poi.ss.util.CellUtil;
3336

3437
/**
3538
* csv cell style
@@ -279,4 +282,12 @@ public void setShrinkToFit(boolean shrinkToFit) {}
279282
public boolean getShrinkToFit() {
280283
return false;
281284
}
285+
286+
@Override
287+
public EnumMap<CellPropertyType, Object> getFormatProperties() {
288+
return CellUtil.getFormatProperties(this);
289+
}
290+
291+
@Override
292+
public void invalidateCachedProperties() {}
282293
}

fesod/src/main/java/org/apache/fesod/sheet/write/metadata/fill/AnalysisCell.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package org.apache.fesod.sheet.write.metadata.fill;
2121

2222
import java.util.List;
23-
import lombok.EqualsAndHashCode;
2423
import lombok.Getter;
2524
import lombok.Setter;
2625
import org.apache.fesod.sheet.enums.WriteTemplateAnalysisCellTypeEnum;
@@ -32,7 +31,6 @@
3231
**/
3332
@Getter
3433
@Setter
35-
@EqualsAndHashCode
3634
public class AnalysisCell {
3735
private int columnIndex;
3836
private int rowIndex;

lombok.config

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,19 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
118
lombok.toString.callSuper = CALL
219
lombok.equalsAndHashCode.callSuper= CALL

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<maven.javadoc.skip>true</maven.javadoc.skip>
5454
<maven.test.skip>true</maven.test.skip>
5555
<commons-csv.version>1.11.0</commons-csv.version>
56-
<poi.version>5.4.1</poi.version>
56+
<poi.version>5.5.1</poi.version>
5757
<ehcache.version>3.9.11</ehcache.version>
5858
<commons-io.version>2.16.1</commons-io.version>
5959
<slf4j-api.version>1.7.36</slf4j-api.version>

0 commit comments

Comments
 (0)