Merge branch '2.x' of https://github.com/seata/seata into dev_protocal

# Conflicts:
#	core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolDecoderV1.java
#	core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolEncoderV1.java
#	serializer/seata-serializer-seata/src/main/java/io/seata/serializer/seata/MessageCodecFactory.java

.asf.yaml

@@ -0,0 +1,54 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+github:
+  description: ":fire: Seata is an easy-to-use, high-performance, open source distributed transaction solution."
+  homepage: https://seata.apache.org/
+  labels:
+    - at
+    - tcc
+    - saga
+    - xa
+  enabled_merge_buttons:
+    squash: true
+    merge: false
+    rebase: false
+  dependabot_alerts: true
+  dependabot_updates: false
+  protected_branches:
+    master:
+      required_status_checks:
+        strict: true
+      required_pull_request_reviews:
+        dismiss_stale_reviews: true
+        required_approving_review_count: 1
+    develop:
+      required_status_checks:
+        strict: true
+      required_pull_request_reviews:
+        dismiss_stale_reviews: true
+        required_approving_review_count: 1
+    2.x:
+      required_status_checks:
+        strict: true
+      required_pull_request_reviews:
+        dismiss_stale_reviews: true
+        required_approving_review_count: 1
+notifications:
+  commits: notifications@seata.apache.org
+  issues: dev@seata.apache.org
+  pullrequests: dev@seata.apache.org
+  discussions: dev@seata.apache.org

.github/workflows/build.yml

@@ -28,20 +28,27 @@ jobs:
       # step 3
       - name: "Print maven version"
         run: ./mvnw -version
-      # step 4
-      - name: "Build with Maven"
+      # step 4.1
+      - name: "Test, Check style, Check license with Maven and Java8"
+        if: matrix.java == '8'
+        run: |
+          ./mvnw -T 4C clean test \
+                 -Dcheckstyle.skip=false -Dlicense.skip=false \
+                 -Dmaven.git-commit-id.skip=true \
+                 -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+      # step 4.2
+      - name: "Test with Maven and Java${{ matrix.java }}"
+        if: matrix.java != '8'
         run: |
-          if [ "${{ matrix.java }}" == "8" ]; then
-            ./mvnw -T 4C clean test -Dcheckstyle.skip=false -Dlicense.skip=false -Dmaven.git-commit-id.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
-          elif [ "${{ matrix.java }}" == "17" ]; then
-            ./mvnw -T 4C clean test -Dcheckstyle.skip=true  -Dlicense.skip=true  -Dmaven.git-commit-id.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
-          fi
+          ./mvnw -T 4C clean test \
+                 -Dmaven.git-commit-id.skip=true \
+                 -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
       # step 5
       - name: "Codecov"
         if: matrix.java == '8'
         uses: codecov/codecov-action@v3.1.4
 
-  # job 2: Test on 'arm64v8/ubuntu' OS.
+  # job 2: Build on 'arm64v8/ubuntu' OS (Skip tests).
   build_arm64-binary:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'push' && (github.ref_name == 'develop' || github.ref_name == 'snapshot' || github.ref_name == '2.x') }}
@@ -56,11 +63,15 @@ jobs:
         id: qemu
         uses: docker/setup-qemu-action@v3
       # step 3
-      - name: "Build arm-binary"
+      - name: "Build with Maven on 'arm64v8/ubuntu:20.04' OS (Skip tests)"
         run: |
           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 -Dmaven.git-commit-id.skip=true clean install -U'
+                       mvn clean install \
+                           -Prelease-seata \
+                           -DskipTests \
+                           -Dmaven.git-commit-id.skip=true \
+                           -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'

.github/workflows/test-druid.yml

@@ -11,8 +11,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 8, 11, 17, 21 ]
         druid: [
+          1.2.20,
           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
@@ -50,15 +50,14 @@ jobs:
         uses: actions/setup-java@v3.12.0
         with:
           distribution: 'zulu'
-          java-version: ${{ matrix.java }}
+          java-version: 8
       # step 3
       - name: "Print maven version"
         run: ./mvnw -version
       # step 4
-      - name: "Test with Maven"
+      - name: "Test with Maven and Druid ${{ matrix.druid }}"
         run: |
-          if [ "${{ matrix.java }}" == "8" ]; then
-            ./mvnw -T 4C clean test -Ddruid.version=${{ matrix.druid }} -Dcheckstyle.skip=false -Dlicense.skip=false -Dmaven.git-commit-id.skip=true -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  -Dmaven.git-commit-id.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
-          fi
+          ./mvnw -T 4C clean test \
+                 -Ddruid.version=${{ matrix.druid }} \
+                 -Dmaven.git-commit-id.skip=true \
+                 -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;

.github/workflows/test.yml

@@ -8,26 +8,25 @@ jobs:
   # job 1
   test:
     name: "test"
-    runs-on: ubuntu-latest
+    runs-on: "${{ matrix.os }}-latest"
     strategy:
       fail-fast: false
       matrix:
         java: [ 8, 11, 17, 21 ]
+        os: [
+          ubuntu,
+          macos,
+          windows, # Skip tests, because too many errors in unit-test.
+        ]
         springboot: [
-          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,
+          2.7.18         -D spring-framework.version=5.3.31,
+          2.6.15         -D spring-framework.version=5.3.27,
+          2.5.15         -D spring-framework.version=5.3.27,
+          2.4.13         -D spring-framework.version=5.3.13,
+          2.3.12.RELEASE -D spring-framework.version=5.2.15.RELEASE,
+          2.2.13.RELEASE -D spring-framework.version=5.2.12.RELEASE,
           #2.1.18.RELEASE,
           #2.0.9.RELEASE,
-          #1.5.22.RELEASE,
-          #1.4.7.RELEASE,
-          #1.3.8.RELEASE,
-          #1.2.8.RELEASE,
-          #1.1.12.RELEASE,
-          #1.0.2.RELEASE
         ]
     steps:
       # step 1
@@ -40,29 +39,40 @@ jobs:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
       # step 3
-      - name: "Print maven version"
-        run: ./mvnw -version
-      # step 4
-      - name: "Test with Maven"
-        # https://docs.github.com/cn/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#github-context
+      ## step 3.1: for Ubuntu and MacOS
+      - name: "Test with Maven on '${{ matrix.os }}' OS"
+        if: matrix.os != 'windows'
         run: |
-          if [ "${{ matrix.java }}" == "8" ]; then
-            ./mvnw -T 4C clean test -P args-for-client-test -Dspring-boot.version=${{ matrix.springboot }} -Dcheckstyle.skip=false -Dlicense.skip=false -Dmaven.git-commit-id.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
-          else
-            ./mvnw -T 4C clean test -P args-for-client-test -Dspring-boot.version=${{ matrix.springboot }} -Dcheckstyle.skip=true  -Dlicense.skip=true  -Dmaven.git-commit-id.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
-          fi
+          ./mvnw     -version;
+          ./mvnw     -T 4C clean test \
+                     -P args-for-client-test \
+                     -Dspring-boot.version=${{ matrix.springboot }} \
+                     -Dmaven.git-commit-id.skip=true \
+                     -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+      ## step 3.2: for Windows
+      - name: "Build with Maven on 'windows' OS (Skip tests)"
+        if: matrix.os == 'windows'
+        run: | # Skip tests, because too many errors in unit-test.
+          ./mvnw.cmd -version;
+          ./mvnw.cmd clean install -P args-for-client-test -DskipTests -D spring-boot.version=${{ matrix.springboot }} -D maven.git-commit-id.skip=true -e -B -D org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
 
   # job 2
   test-springboot3x:
     name: "test-springboot3.x"
-    runs-on: ubuntu-latest
+    runs-on: "${{ matrix.os }}-latest"
     strategy:
       fail-fast: false
       matrix:
         java: [ 17, 21 ]
+        os: [
+          ubuntu,
+          macos,
+          windows, # Skip tests, because too many errors in unit-test.
+        ]
         springboot: [
-          3.1.4  -Dspring-framework.version=6.0.12,
-          3.0.11 -Dspring-framework.version=6.0.12,
+          3.2.0  -D spring-framework.version=6.1.1,
+          3.1.6  -D spring-framework.version=6.0.14,
+          3.0.13 -D spring-framework.version=6.0.14,
         ]
     steps:
       # step 1
@@ -75,34 +85,39 @@ jobs:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
       # step 3
-      - name: "Print maven version"
-        run: ./mvnw -version
-      # step 4
-      - name: "Test with Maven"
+      ## step 3.1: for Ubuntu and MacOS
+      - name: "Test with Maven on '${{ matrix.os }}' OS"
+        if: matrix.os != 'windows'
         run: |
-          ./mvnw -T 4C clean test -P args-for-client-test -Dspring-boot.version=${{ matrix.springboot }} -Dkotlin-maven-plugin.version=1.7.22 -Dcheckstyle.skip=true -Dlicense.skip=true -Dmaven.git-commit-id.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+          ./mvnw     -version;
+          ./mvnw     -T 4C clean install \
+                     -P args-for-client-test \
+                     -Dspring-boot.version=${{ matrix.springboot }} \
+                     -Dmaven.git-commit-id.skip=true \
+                     -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+      ## step 3.2: for Windows
+      - name: "Build with Maven on 'windows' OS (Skip tests)"
+        if: matrix.os == 'windows'
+        run: | # Skip tests, because too many errors in unit-test.
+          ./mvnw.cmd -version;
+          ./mvnw.cmd clean install -P args-for-client-test -DskipTests -D spring-boot.version=${{ matrix.springboot }} -D maven.git-commit-id.skip=true -e -B -D org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
 
   # job 3
-  arm64-test:
+  test-arm64:
+    name: "test-arm64"
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         springboot: [
-          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.7.18         -Dspring-framework.version=5.3.31, # The maven-compiler-plugin will throw an error for an unknown reason.
+          #2.6.15         -Dspring-framework.version=5.3.27, # The maven-compiler-plugin will throw an error for an unknown reason.
+          #2.5.15         -Dspring-framework.version=5.3.27, # The maven-compiler-plugin will throw an error for an unknown reason.
           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,
           #2.1.18.RELEASE,
           #2.0.9.RELEASE,
-          #1.5.22.RELEASE,
-          #1.4.7.RELEASE,
-          #1.3.8.RELEASE,
-          #1.2.8.RELEASE,
-          #1.1.12.RELEASE,
-          #1.0.2.RELEASE
         ]
     steps:
       # step 1
@@ -111,18 +126,18 @@ jobs:
       # step 2
       - name: "Set up QEMU"
         id: qemu
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
       # step 3
-      - name: "install"
+      - name: "Build with Maven on 'arm64v8/ubuntu:20.04' OS (Skip tests)"
         run: |
           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'
-      # step 4
-      - name: "Print maven version"
-        run: ./mvnw -version
-      # step 5
-      - name: "test-arm64"
-        run: |
-          ./mvnw -T 4C clean test -P args-for-client-test -Dspring-boot.version=${{ matrix.springboot }} -Dcheckstyle.skip=true -Dlicense.skip=true -Dmaven.git-commit-id.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn          
+                       apt-get install maven -y && \
+                       mvn -version && \
+                       mvn -T 4C clean install \
+                           -Dspring-boot.version=${{ matrix.springboot }} \
+                           -Prelease-seata \
+                           -DskipTests \
+                           -Dmaven.git-commit-id.skip=true \
+                           -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'

.licenserc.yaml

@@ -1,28 +1,31 @@
 #
-# Copyright 1999-2019 Seata.io Group.
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
 header:
   license:
     spdx-id: Apache-2.0
-    copyright-owner: Seata.io
+    copyright-owner: Apache Software Foundation
     content: |
-      Copyright 1999-2019 Seata.io Group.
-    
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
+      Licensed to the Apache Software Foundation (ASF) under one or more
+      contributor license agreements.  See the NOTICE file distributed with
+      this work for additional information regarding copyright ownership.
+      The ASF licenses this file to You under the Apache License, Version 2.0
+      (the "License"); you may not use this file except in compliance with
+      the License.  You may obtain a copy of the License at
       
       http://www.apache.org/licenses/LICENSE-2.0