merge

PeppaO · Oct 14, 2023 · 89da2fb · 89da2fb
2 parents 4a16244 + 24171a8
commit 89da2fb
Show file tree

Hide file tree

Showing 454 changed files with 33,813 additions and 1,884 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,10 +18,10 @@ jobs:
     steps:
       # step 1
       - name: "Checkout"
-        uses: actions/checkout@v2.4.0
+        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:
@@ -50,7 +50,7 @@ jobs:
     steps:
       # step 1
       - name: "Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       # step 2
       - name: "Set up QEMU"
         id: qemu
@@ -61,6 +61,6 @@ jobs:
           docker run --rm -v ${{ github.workspace }}:/ws:rw --workdir=/ws \
             arm64v8/ubuntu:20.04 \
             bash -exc 'apt-get update -y && \
-            apt-get install maven -y && \
-            mvn -version && \
-            mvn -Prelease-seata -DskipTests clean install -U'
+                       apt-get install maven -y && \
+                       mvn -version && \
+                       mvn -Prelease-seata -DskipTests clean install -U'
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -1,14 +1,3 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
 name: "CodeQL"
 
 on:
@@ -30,43 +19,26 @@ jobs:
       fail-fast: false
       matrix:
         language: [ 'java' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
       # step 1
-      - name: "Checkout repository"
-        uses: actions/checkout@v2
+      - name: "Checkout"
+        uses: actions/checkout@v3
 
       # step 2: Initializes the CodeQL tools for scanning.
       - name: "Initialize CodeQL"
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
       # step 3
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: "Autobuild"
-        uses: github/codeql-action/autobuild@v1
+        uses: github/codeql-action/autobuild@v2
 
       # step 4
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 https://git.io/JvXDl
-
-      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-      #    and modify them (or add more) to build your code if your project
-      #    uses a compiled language
-
-      #- run: |
-      #   make bootstrap
-      #   make release
-
-      # step 5
       - name: "Perform CodeQL Analysis"
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/license-checker.yaml b/.github/workflows/license-checker.yaml
@@ -8,17 +8,25 @@ 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@v2.4.0
-      # step 2
+        uses: actions/checkout@v3
+      # 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'
+      # step 4 check license
       - name: Check License Header
         uses: apache/skywalking-eyes/header@8fc52baabc14c86294d96034bcc194cfa7f76b05
         with:
           log: info
           config: .licenserc.yaml
           mode: check
-      # step 3
+      # step 5 check dependencies
       - name: Check Dependencies' License
         uses: apache/skywalking-eyes/dependency@8fc52baabc14c86294d96034bcc194cfa7f76b05
         with:

diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
@@ -21,10 +21,10 @@ jobs:
     steps:
       # step 1
       - name: "Checkout"
-        uses: actions/checkout@v2.4.0
+        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,
@@ -32,10 +32,10 @@ jobs:
     steps:
       # step 1
       - name: "Checkout"
-        uses: actions/checkout@v2.4.0
+        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@v2.4.0
+        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,
@@ -106,7 +107,7 @@ jobs:
     steps:
       # step 1
       - name: "Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       # step 2
       - name: "Set up QEMU"
         id: qemu
@@ -117,7 +118,7 @@ jobs:
           docker run --rm -v ${{ github.workspace }}:/ws:rw --workdir=/ws \
             arm64v8/ubuntu:20.04 \
             bash -exc 'apt-get update -y && \
-            apt-get install maven -y'
+                       apt-get install maven -y'
       # step 4
       - name: "Print maven version"
         run: ./mvnw -version

diff --git a/.licenserc.yaml b/.licenserc.yaml
@@ -75,6 +75,7 @@ header:
     - 'ext/apm-seata-skywalking-plugin/config/agent.config'
     - 'server/src/main/resources/lua/redislocker/redislock.lua'
     - 'server/src/main/resources/banner.txt'
+    - '**/org/springframework/**'
 
 
   comment: on-failure

diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ install: true
 
 before_script:
   - if [ "$TRAVIS_JDK_VERSION" == "openjdk8" ]; then
-      export IMAGE_NAME="openjdk:8u212-jre-alpine";
+      export IMAGE_NAME="openjdk:8-jre-slim";
     fi
   - if [ "$TRAVIS_JDK_VERSION" == "openjdk11" ]; then
       export IMAGE_NAME="openjdk:11-jre-stretch";

diff --git a/README.md b/README.md
@@ -5,7 +5,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.1)](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)
 
 
@@ -81,22 +81,28 @@ 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` and `io.seata:seata-spring-boot-starter`.
 ```xml
-<seata.version>1.6.1</seata.version>
-<dependency>
+<properties>
+  <seata.version>1.7.1</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