升级新版本

5 months ago · b9e76d8342
12 changed files with 30 additions and 58 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -23,7 +23,7 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        java: [ 8, 11, 17]
+        java: [ 8, 11, 17, 21]
        distribution: [ 'adopt' ]
      fail-fast: false
      max-parallel: 4
--- a/easyexcel-core/src/main/java/com/alibaba/excel/read/listener/ModelBuildEventListener.java
+++ b/easyexcel-core/src/main/java/com/alibaba/excel/read/listener/ModelBuildEventListener.java
@ -4,9 +4,6 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Map;

-import javax.print.DocFlavor.STRING;
-
-import com.alibaba.excel.constant.EasyExcelConstants;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.enums.CellDataTypeEnum;
 import com.alibaba.excel.enums.HeadKindEnum;
@ -17,15 +14,13 @@ import com.alibaba.excel.metadata.data.DataFormatData;
 import com.alibaba.excel.metadata.data.ReadCellData;
 import com.alibaba.excel.read.metadata.holder.ReadSheetHolder;
 import com.alibaba.excel.read.metadata.property.ExcelReadHeadProperty;
+import com.alibaba.excel.support.cglib.beans.BeanMap;
 import com.alibaba.excel.util.BeanMapUtils;
-import com.alibaba.excel.util.BooleanUtils;
 import com.alibaba.excel.util.ClassUtils;
 import com.alibaba.excel.util.ConverterUtils;
 import com.alibaba.excel.util.DateUtils;
 import com.alibaba.excel.util.MapUtils;
-import com.alibaba.excel.util.StringUtils;

-import org.springframework.cglib.beans.BeanMap;

 /**
 * Convert to the object the user needs
--- a/easyexcel-core/src/main/java/com/alibaba/excel/util/BeanMapUtils.java
+++ b/easyexcel-core/src/main/java/com/alibaba/excel/util/BeanMapUtils.java
@ -1,7 +1,7 @@
 package com.alibaba.excel.util;

-import org.springframework.cglib.beans.BeanMap;
-import org.springframework.cglib.core.DefaultNamingPolicy;
+import com.alibaba.excel.support.cglib.beans.BeanMap;
+import com.alibaba.excel.support.cglib.core.DefaultNamingPolicy;

 /**
 * bean utils
--- a/easyexcel-core/src/main/java/com/alibaba/excel/util/ClassUtils.java
+++ b/easyexcel-core/src/main/java/com/alibaba/excel/util/ClassUtils.java
@ -33,6 +33,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
 import com.alibaba.excel.metadata.property.FontProperty;
 import com.alibaba.excel.metadata.property.NumberFormatProperty;
 import com.alibaba.excel.metadata.property.StyleProperty;
+import com.alibaba.excel.support.cglib.beans.BeanMap;
 import com.alibaba.excel.write.metadata.holder.WriteHolder;

 import lombok.AllArgsConstructor;
@ -41,7 +42,6 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.cglib.beans.BeanMap;

 /**
 * Licensed to the Apache Software Foundation (ASF) under one or more
--- a/easyexcel-core/src/main/java/com/alibaba/excel/util/FieldUtils.java
+++ b/easyexcel-core/src/main/java/com/alibaba/excel/util/FieldUtils.java
@ -5,8 +5,7 @@ import java.lang.reflect.Modifier;
 import java.util.Map;

 import com.alibaba.excel.metadata.NullObject;
-
-import org.springframework.cglib.beans.BeanMap;
+import com.alibaba.excel.support.cglib.beans.BeanMap;

 /**
 * Licensed to the Apache Software Foundation (ASF) under one or more
--- a/easyexcel-core/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java
+++ b/easyexcel-core/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java
@ -1,12 +1,10 @@
 package com.alibaba.excel.write.executor;

-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeMap;

 import com.alibaba.excel.context.WriteContext;
 import com.alibaba.excel.enums.HeadKindEnum;
@ -14,6 +12,7 @@ import com.alibaba.excel.metadata.FieldCache;
 import com.alibaba.excel.metadata.FieldWrapper;
 import com.alibaba.excel.metadata.Head;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import com.alibaba.excel.support.cglib.beans.BeanMap;
 import com.alibaba.excel.util.BeanMapUtils;
 import com.alibaba.excel.util.ClassUtils;
 import com.alibaba.excel.util.FieldUtils;
@ -30,7 +29,6 @@ import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
-import org.springframework.cglib.beans.BeanMap;

 /**
 * Add the data into excel
--- a/easyexcel-support/pom.xml
+++ b/easyexcel-support/pom.xml
@ -21,7 +21,7 @@
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-core</artifactId>
-            <version>5.3.27</version>
+            <version>5.3.37</version>
            <exclusions>
                <exclusion>
                    <groupId>org.springframework</groupId>
--- a/easyexcel-test/pom.xml
+++ b/easyexcel-test/pom.xml
@ -29,17 +29,17 @@
        <dependency>
            <groupId>com.alibaba.fastjson2</groupId>
            <artifactId>fastjson2</artifactId>
-            <version>2.0.29</version>
+            <version>2.0.51</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
-            <version>2.7.11</version>
+            <version>2.7.18</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-test</artifactId>
-            <version>2.7.11</version>
+            <version>2.7.18</version>
        </dependency>

        <!-- logback -->
@ -61,7 +61,7 @@
        <dependency>
            <groupId>ch.qos.logback</groupId>
            <artifactId>logback-classic</artifactId>
-            <version>1.2.12</version>
+            <version>1.5.6</version>
        </dependency>
    </dependencies>

--- a/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/Xls03Test.java
+++ b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/Xls03Test.java
@ -3,14 +3,14 @@ package com.alibaba.easyexcel.test.temp;
 import java.util.List;

 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.cglib.beans.BeanMap;
+import com.alibaba.excel.support.cglib.core.DebuggingClassWriter;
 import com.alibaba.excel.util.BeanMapUtils;
 import com.alibaba.fastjson2.JSON;

 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cglib.beans.BeanMap;
-import org.springframework.cglib.core.DebuggingClassWriter;

 /**
 * 临时测试
--- a/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/write/TempWriteTest.java
+++ b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/write/TempWriteTest.java
@ -8,6 +8,7 @@ import java.util.Map;
 import com.alibaba.easyexcel.test.demo.read.CustomStringStringConverter;
 import com.alibaba.easyexcel.test.util.TestFileUtil;
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.cglib.beans.BeanMap;
 import com.alibaba.excel.util.BeanMapUtils;
 import com.alibaba.excel.util.FileUtils;
 import com.alibaba.excel.util.ListUtils;
@ -24,7 +25,6 @@ import org.apache.poi.xssf.streaming.SXSSFSheet;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.junit.jupiter.api.Test;
-import org.springframework.cglib.beans.BeanMap;

@Slf4j
 public class TempWriteTest {
--- a/pom.xml
+++ b/pom.xml
@ -20,7 +20,7 @@


    <properties>
-        <revision>4.0.0-beta1</revision>
+        <revision>4.0.0</revision>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <jdk.version>1.8</jdk.version>
        <gpg.skip>true</gpg.skip>
@ -90,40 +90,45 @@
            <dependency>
                <groupId>com.alibaba</groupId>
                <artifactId>easyexcel-support</artifactId>
-                <version>${revision}</version>
+                <version>3.3.4</version>
            </dependency>

            <dependency>
                <groupId>org.apache.poi</groupId>
                <artifactId>poi</artifactId>
-                <version>5.2.3</version>
+                <version>5.2.5</version>
            </dependency>
            <dependency>
                <groupId>org.apache.poi</groupId>
                <artifactId>poi-ooxml</artifactId>
-                <version>5.2.3</version>
+                <version>5.2.5</version>
            </dependency>
            <dependency>
                <groupId>org.apache.commons</groupId>
                <artifactId>commons-csv</artifactId>
-                <version>1.10.0</version>
+                <version>1.11.0</version>
            </dependency>
            <dependency>
                <groupId>org.ehcache</groupId>
                <artifactId>ehcache</artifactId>
-                <version>3.9.9</version>
+                <version>3.10.8</version>
            </dependency>
            <dependency>
                <groupId>commons-io</groupId>
                <artifactId>commons-io</artifactId>
                <version>2.11.0</version>
            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.7.36</version>
+            </dependency>

            <!-- provided -->
            <dependency>
                <groupId>org.projectlombok</groupId>
                <artifactId>lombok</artifactId>
-                <version>1.18.26</version>
+                <version>1.18.32</version>
            </dependency>
        </dependencies>
    </dependencyManagement>
@ -313,31 +318,6 @@
                    </execution>
                </executions>
            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <includes>
-                                    <include>${project.groupId}:${project.artifactId}</include>
-                                </includes>
-                            </artifactSet>
-                            <relocations>
-                                <relocation>
-                                    <pattern>org.springframework</pattern>
-                                    <shadedPattern>com.alibaba.excel.support</shadedPattern>
-                                </relocation>
-                            </relocations>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>

            <plugin>
                <groupId>org.codehaus.mojo</groupId>
--- a/update.md
+++ b/update.md
@ -1,7 +1,7 @@
-# 4.0.0-beta1
+# 4.0.0

-* `poi`由`4.1.2`升级到`5.2.3`
-* `commons-csv`由`1.9.0`升级到`1.10.0`
+* `poi`由`4.1.2`升级到`5.2.5`
+* `commons-csv`由`1.1.0`升级到`1.10.0`
 * `slf4j-api`由`1.7.32`升级到`1.7.36`
 * `ehcache`由`3.9.9`升级到`3.10.8`