merge

PeppaO · Oct 14, 2023 · 8cc6704 · 8cc6704
2 parents 33a8b94 + 20662fd
commit 8cc6704
Show file tree

Hide file tree

Showing 336 changed files with 26,516 additions and 1,549 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
         uses: actions/checkout@v3
       # step 2
       - name: "Set up Java JDK"
-        uses: actions/setup-java@v2.5.0
+        uses: actions/setup-java@v3.12.0
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
@@ -38,8 +38,8 @@ jobs:
           fi
       # step 5
       - name: "Codecov"
-        if: matrix.java == '17'
-        uses: codecov/codecov-action@v2.1.0
+        if: matrix.java == '8'
+        uses: codecov/codecov-action@v3.1.4
 
   # job 2: Test on 'arm64v8/ubuntu' OS.
   build_arm64-binary:

diff --git a/.github/workflows/license-checker.yaml b/.github/workflows/license-checker.yaml
@@ -8,25 +8,27 @@ jobs:
   check-license:
     runs-on: ubuntu-latest
     steps:
-      # step 1
+      # step 1 clear cache
+      - name: Clear cache directory first before trying to restore from cache
+        run: sudo rm -rf $(go env GOMODCACHE) && sudo rm -rf $(go env GOCACHE)
+        shell: bash
+      # step 2 checkout
       - name: Checkout
         uses: actions/checkout@v3
-      # step 2 https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/
+      # step 3 https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/
       - uses: actions/setup-node@v3
         with:
           node-version: '14.x'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
-      # step 3
+      # step 4 check license
       - name: Check License Header
-        uses: apache/skywalking-eyes/header@main
+        uses: apache/skywalking-eyes/header@8fc52baabc14c86294d96034bcc194cfa7f76b05
         with:
           log: info
           config: .licenserc.yaml
           mode: check
-      # step 4
+      # step 5 check dependencies
       - name: Check Dependencies' License
-        uses: apache/skywalking-eyes/dependency@main
+        uses: apache/skywalking-eyes/dependency@8fc52baabc14c86294d96034bcc194cfa7f76b05
         with:
           log: info
           config: .licenserc.yaml

diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@v3
       # step 2
       - name: "Setup Java JDK"
-        uses: actions/setup-java@v3.9.0
+        uses: actions/setup-java@v3.12.0
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}

diff --git a/.github/workflows/publish-ossrh.yml b/.github/workflows/publish-ossrh.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v2.4.0
       # step 2
       - name: "Setup Java JDK"
-        uses: actions/setup-java@v3.9.0
+        uses: actions/setup-java@v3.12.0
         with:
           distribution: 'zulu'
           java-version: 8

diff --git a/.github/workflows/test-druid.yml b/.github/workflows/test-druid.yml
@@ -0,0 +1,64 @@
+name: "test-druid"
+
+on:
+  push:
+    branches: [ test*, "*.*.*" ]
+
+jobs:
+  test-druid:
+    name: "test-druid"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ 8, 11, 17, 21 ]
+        druid: [
+          1.2.19,
+          #1.2.18, # Unit test triggered a bug in Druid, see the commit https://github.com/alibaba/druid/commit/6c493f852852fb287ed5fd31ee16c27ead0ea5cf
+          #1.2.17, # Unit test triggered a bug in Druid, see the commit https://github.com/alibaba/druid/commit/6c493f852852fb287ed5fd31ee16c27ead0ea5cf
+          1.2.16,
+          1.2.15,
+          1.2.14,
+          1.2.13,
+          1.2.12,
+          1.2.11,
+          1.2.10,
+          1.2.9,
+          1.2.8,
+          1.2.7,
+          1.2.6,
+          1.2.5,
+          1.2.4,
+          1.2.3,
+          1.2.2,
+          1.2.1,
+          1.2.0,
+
+          # not support druid:1.1.x
+          #1.1.24,
+          #1.1.23,
+          #1.1.22,
+          #1.1.21,
+          #1.1.20,
+        ]
+    steps:
+      # step 1
+      - name: "Checkout"
+        uses: actions/checkout@v3
+      # step 2
+      - name: "Set up Java JDK"
+        uses: actions/setup-java@v3.12.0
+        with:
+          distribution: 'zulu'
+          java-version: ${{ matrix.java }}
+      # step 3
+      - name: "Print maven version"
+        run: ./mvnw -version
+      # step 4
+      - name: "Test with Maven"
+        run: |
+          if [ "${{ matrix.java }}" == "8" ]; then
+            ./mvnw -T 4C clean test -Ddruid.version=${{ matrix.druid }} -Dcheckstyle.skip=false -Dlicense.skip=false -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+          else
+            ./mvnw -T 4C clean test -Ddruid.version=${{ matrix.druid }} -Dcheckstyle.skip=true  -Dlicense.skip=true  -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+          fi
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,11 +12,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 8, 11, 17 ]
+        java: [ 8, 11, 17, 21 ]
         springboot: [
-          2.7.9          -Dspring-framework.version=5.3.25,
-          2.6.14         -Dspring-framework.version=5.3.24,
-          2.5.14         -Dspring-framework.version=5.3.20,
+          2.7.16         -Dspring-framework.version=5.3.30,
+          2.6.15         -Dspring-framework.version=5.3.27,
+          2.5.15         -Dspring-framework.version=5.3.27,
           2.4.13         -Dspring-framework.version=5.3.13,
           2.3.12.RELEASE -Dspring-framework.version=5.2.15.RELEASE,
           2.2.13.RELEASE -Dspring-framework.version=5.2.12.RELEASE,
@@ -35,7 +35,7 @@ jobs:
         uses: actions/checkout@v3
       # step 2
       - name: "Set up Java JDK"
-        uses: actions/setup-java@v2.5.0
+        uses: actions/setup-java@v3.12.0
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
@@ -59,17 +59,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 17 ]
+        java: [ 17, 21 ]
         springboot: [
-          3.0.4 -Dspring-framework.version=6.0.6 -Dspring-boot-for-server.version=2.5.14 -Dspring-framework-for-server.version=5.3.20 -Dkotlin-maven-plugin.version=1.7.22
+          3.1.4  -Dspring-framework.version=6.0.12,
+          3.0.11 -Dspring-framework.version=6.0.12,
         ]
     steps:
       # step 1
       - name: "Checkout"
         uses: actions/checkout@v3
       # step 2
       - name: "Set up Java JDK"
-        uses: actions/setup-java@v2.5.0
+        uses: actions/setup-java@v3.12.0
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
@@ -79,7 +80,7 @@ jobs:
       # step 4
       - name: "Test with Maven"
         run: |
-          ./mvnw -T 4C clean test -Dspring-boot.version=${{ matrix.springboot }} -Dcheckstyle.skip=false -Dlicense.skip=false -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+          ./mvnw -T 4C clean test -Dspring-boot.version=${{ matrix.springboot }} -Dspring-boot-for-server.version=2.5.14 -Dspring-framework-for-server.version=5.3.20 -Dkotlin-maven-plugin.version=1.7.22 -Dcheckstyle.skip=true -Dlicense.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
 
   # job 3
   arm64-test:
@@ -88,9 +89,9 @@ jobs:
       fail-fast: false
       matrix:
         springboot: [
-          2.7.9          -Dspring-framework.version=5.3.25,
-          2.6.14         -Dspring-framework.version=5.3.24,
-          2.5.14         -Dspring-framework.version=5.3.20,
+          2.7.16         -Dspring-framework.version=5.3.30,
+          2.6.15         -Dspring-framework.version=5.3.27,
+          2.5.15         -Dspring-framework.version=5.3.27,
           2.4.13         -Dspring-framework.version=5.3.13,
           2.3.12.RELEASE -Dspring-framework.version=5.2.15.RELEASE,
           2.2.13.RELEASE -Dspring-framework.version=5.2.12.RELEASE,

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 [![Build Status](https://github.com/seata/seata/workflows/build/badge.svg?branch=develop)](https://github.com/seata/seata/actions)
 [![codecov](https://codecov.io/gh/seata/seata/branch/develop/graph/badge.svg)](https://codecov.io/gh/seata/seata)
 [![license](https://img.shields.io/github/license/seata/seata.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
-[![maven](https://img.shields.io/maven-central/v/io.seata/seata-parent.svg)](https://search.maven.org/search?q=io.seata)
+[![maven](https://img.shields.io/maven-central/v/io.seata/seata-parent?versionSuffix=1.7.0)](https://search.maven.org/search?q=io.seata)
 [![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/seata/seata.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/seata/seata/context:java)
 
 
@@ -83,23 +83,31 @@ For more details about principle and design, please go to [Seata wiki page](http
 
 
 ## Maven dependency
+
+Depending on the scenario, choose one of the two dependencies: `io.seata:seata-all` or `io.seata:seata-spring-boot-starter`.
 ```xml
-<seata.version>1.6.1</seata.version>
-<dependency>
+<properties>
+  <seata.version>1.7.0</seata.version>
+</properties>
+
+<dependencies>
+<!--dependencies for non-SpringBoot application framework-->
+  <dependency>
     <groupId>io.seata</groupId>
     <artifactId>seata-all</artifactId>
     <version>${seata.version}</version>
-</dependency>
+  </dependency>
 
 <!--If your project base on `Spring Boot`, you can directly use the following dependencies-->
-<!--Notice: `seata-spring-boot-starter` has included `seata-all` dependency-->
-<dependency>
+<!--Notice: `seata-spring-boot-starter` has already included `seata-all` dependency-->
+  <dependency>
     <groupId>io.seata</groupId>
     <artifactId>seata-spring-boot-starter</artifactId>
     <version>${seata.version}</version>
-</dependency>
-
+  </dependency>
+</dependencies>
 ```
+
 ## Quick Start
 
 [Quick Start](https://seata.io/zh-cn/docs/ops/deploy-guide-beginner.html)

diff --git a/all/pom.xml b/all/pom.xml
@@ -264,11 +264,6 @@
             <artifactId>seata-compressor-gzip</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>io.seata</groupId>
-            <artifactId>seata-compressor-7z</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-compressor-bzip2</artifactId>
@@ -384,6 +379,11 @@
             <artifactId>logback-classic</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
@@ -440,6 +440,11 @@
             <artifactId>registry-client-all</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.alipay.sofa</groupId>
+            <artifactId>hessian</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.alibaba.spring</groupId>
             <artifactId>spring-context-support</artifactId>
@@ -641,15 +646,12 @@
                             </artifactSet>
                             <transformers>
                                 <!-- META-INF/services -->
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
                                 <!-- spring相关 -->
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>META-INF/spring.handlers</resource>
                                 </transformer>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>META-INF/spring.schemas</resource>
                                 </transformer>
                             </transformers>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -290,11 +290,6 @@
                 <artifactId>seata-compressor-zip</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.seata</groupId>
-                <artifactId>seata-compressor-7z</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.seata</groupId>
                 <artifactId>seata-compressor-bzip2</artifactId>

diff --git a/build/pom.xml b/build/pom.xml
@@ -111,6 +111,7 @@
         <maven-dependency-plugin.version>3.0.2</maven-dependency-plugin.version>
         <maven-assembly-plugin.version>3.0.0</maven-assembly-plugin.version>
         <jib-maven-plugin.version>3.2.0</jib-maven-plugin.version>
+        <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
         <!-- Deploy && GPG -->
         <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
         <nexus-staging-maven-plugin.version>1.6.7</nexus-staging-maven-plugin.version>
@@ -383,11 +384,11 @@
             </properties>
         </profile>
 
-        <!-- profile: args-for-test-by-jdk17 -->
+        <!-- profile: args-for-test-by-jdk17-and-above -->
         <profile>
-            <id>args-for-test-by-jdk17</id>
+            <id>args-for-test-by-jdk17-and-above</id>
             <activation>
-                <jdk>17</jdk>
+                <jdk>[17,)</jdk>
             </activation>
             <properties>
                 <maven.surefire.argLine>