diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e4270c20..95a3cd0b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: java-version: ${{ matrix.java }} distribution: ${{ matrix.distribution }} - name: Cache local Maven repository - uses: actions/cache@v3 + uses: actions/cache@main with: path: ~/.m2/repository key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} diff --git a/easyexcel-core/pom.xml b/easyexcel-core/pom.xml index f8179003..93d013cc 100644 --- a/easyexcel-core/pom.xml +++ b/easyexcel-core/pom.xml @@ -36,9 +36,5 @@ org.ehcache ehcache - - commons-io - commons-io - diff --git a/easyexcel-support/pom.xml b/easyexcel-support/pom.xml index 85e5a533..f07d0446 100644 --- a/easyexcel-support/pom.xml +++ b/easyexcel-support/pom.xml @@ -24,8 +24,8 @@ 5.3.37 - org.springframework - spring-jcl + * + * @@ -49,7 +49,7 @@ true true - + org.springframework:spring-core @@ -63,6 +63,12 @@ + + + org.springframework + com.alibaba.excel.support + + diff --git a/pom.xml b/pom.xml index 0a3da974..6ff3d13d 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ - 4.0.0 + 4.0.1 UTF-8 1.8 true @@ -113,11 +113,6 @@ ehcache 3.9.11 - - commons-io - commons-io - 2.11.0 - org.slf4j slf4j-api @@ -195,7 +190,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.4 + 3.6.0 org.codehaus.mojo