Merge branch '2.x' into fix#6815

.github/workflows/build.yml

@@ -26,31 +26,41 @@ jobs:
       - name: "Checkout"
         uses: actions/checkout@v3
       # step 2
+      - name: "Use Python 3.x"
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.12'
+      # step 3
       - name: "Set up Java JDK"
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
-      # step 3
+      # step 4
       - name: "Print maven version"
         run: ./mvnw -version
-      # step 4.1
+      # step 5.1
       - name: "Test, Check style, Check PMD, Check license with Maven and Java8"
         if: matrix.java == '8'
         run: |
           ./mvnw -T 4C clean test \
                  -Dcheckstyle.skip=false -Dpmd.skip=false -Dlicense.skip=false -DredisCaseEnabled=true \
                  -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
-      # step 4.2
+      # step 5.2
       - name: "Test with Maven and Java${{ matrix.java }}"
         if: matrix.java != '8'
         run: |
           ./mvnw -T 4C clean test \
                  -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
-      # step 5
+      # step 6
       - name: "Codecov"
         if: matrix.java == '8'
-        uses: codecov/[email protected]
+        uses: codecov/[email protected]
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          version: v0.6.0
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   # job 2: Build on 'arm64v8/ubuntu' OS (Skip tests).
   build_arm64-binary:
@@ -72,10 +82,9 @@ jobs:
           docker run --rm -v ${{ github.workspace }}:/ws:rw --workdir=/ws \
             arm64v8/ubuntu:20.04 \
             bash -exc 'apt-get update -y && \
-                       apt-get install python2 -y && \
-                       python2 --version && \
-                       apt-get install make gcc g++ -y && \
                        apt-get install maven -y && \
+                       apt-get install -y python3 python3-pip python3-distutils && \
+                       apt-get install -y build-essential && \
                        mvn -version && \
                        mvn clean install \
                            -Prelease-seata \

.github/workflows/codeql-analysis.yml

@@ -27,18 +27,14 @@ jobs:
 
       # step 2: Initializes the CodeQL tools for scanning.
       - name: "Initialize CodeQL"
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
 
-      # 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@v2
+      - run: ./mvnw -T 4C clean install -DskipTests
 
-      # step 4
+      # step 3
       - name: "Perform CodeQL Analysis"
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/test.yml

@@ -32,22 +32,32 @@ jobs:
       - name: "Checkout"
         uses: actions/checkout@v3
       # step 2
+      - name: "Use Python 3.x"
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.12'
+      # step 3
       - name: "Set up Java JDK"
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
-      # step 3
-      ## step 3.1: for Ubuntu and MacOS
+      # step 4
+      ## step 4.1: for Ubuntu and MacOS
       - name: "Test with Maven on '${{ matrix.os }}' OS"
         if: matrix.os != 'windows'
         run: |
           if [ "${{ matrix.os }}" == "macos" ]; then
+             python3 -m ensurepip --upgrade;
+             python3 -m pip install --upgrade pip setuptools;
+             if ! python3 -c "import distutils" &>/dev/null; then
+                python3 -m pip install --upgrade setuptools
+             fi
             ./mvnw -T 4C clean test -P args-for-client-test  -P arrch64 -Dspring-boot.version=${{ matrix.springboot }} -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 }} -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
           fi
-      ## step 3.2: for Windows
+      ## step 4.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.
@@ -77,22 +87,32 @@ jobs:
       - name: "Checkout"
         uses: actions/checkout@v3
       # step 2
+      - name: "Use Python 3.x"
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.12'
+      # step 3
       - name: "Set up Java JDK"
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
-      # step 3
-      ## step 3.1: for Ubuntu and MacOS
+      # step 4
+      ## step 4.1: for Ubuntu and MacOS
       - name: "Test with Maven on '${{ matrix.os }}' OS"
         if: matrix.os != 'windows'
         run: |
           if [ "${{ matrix.os }}" == "macos" ]; then
+             python3 -m ensurepip --upgrade;
+             python3 -m pip install --upgrade pip setuptools;
+             if ! python3 -c "import distutils" &>/dev/null; then
+                python3 -m pip install --upgrade setuptools
+             fi
             ./mvnw -T 4C clean test -P args-for-client-test  -P arrch64 -Dspring-boot.version=${{ matrix.springboot }} -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 }} -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
           fi
-      ## step 3.2: for Windows
+      ## step 4.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.
@@ -131,6 +151,8 @@ jobs:
             arm64v8/ubuntu:20.04 \
             bash -exc 'apt-get update -y && \
                        apt-get install maven -y && \
+                       apt-get install -y python3 python3-pip python3-distutils && \
+                       apt-get install -y build-essential && \
                        mvn -version && \
                        mvn -T 4C clean install \
                            -Dspring-boot.version=${{ matrix.springboot }} \

.gitignore

@@ -54,3 +54,10 @@ Thumbs.db
 
 #h2
 *.db
+
+/console/src/main/resources/static/css/
+/console/src/main/resources/static/img/
+/console/src/main/resources/static/js/
+/console/src/main/resources/static/saga-statemachine-designer/
+/console/src/main/resources/static/index.html
+/console/src/main/resources/static/version.json

.licenserc.yaml

@@ -37,26 +37,18 @@ header:
 
   paths-ignore:
     - '.gitignore'
-    - 'CONTRIBUTING.md'
-    - 'CONTRIBUTING_CN.md'
-    - 'CODE_OF_CONDUCT.md'
-    - 'README.md'
+    - '*.md'
     - 'LICENSE'
     - 'NOTICE'
     - 'DISCLAIMER'
     - '**/*.md'
     - '.github/**'
-    #SPI、spring.factories、spring-configuration-metadata.json、additional-spring-configuration-metadata.json
-    - '**/src/test/resources/META-INF/**'
-    - '**/src/main/resources/META-INF/**'
     - '**/target/**'
     - '**/*.iml'
     - 'changes/**'
     - 'style/**'
-    - 'script/**'
     - 'sessionStore/**'
     - 'test/src/test/resources/**'
-    - 'serializer/seata-serializer-protobuf/src/main/resources/protobuf/org/apache/seata/protocol/transcation/*.proto'
     - 'saga/seata-saga-statemachine-designer/node_modules/**'
     - 'node_modules/**'
     - 'saga/seata-saga-statemachine-designer/**'

LICENSE

@@ -208,35 +208,31 @@
    subcomponents is subject to the terms and conditions of the following
    licenses.
 
-   For the package org.apache.seata.sqlparser.antlr.mysql.antlr
-   This product contains a portion of the Antlr project, which is published at
-   https://github.com/antlr/antlr4. The project is licensed under a BSD 3-Clause License:
-
-      Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
-
-      Redistribution and use in source and binary forms, with or without
-      modification, are permitted provided that the following conditions
-      are met:
-
-      1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-      2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-      3. Neither name of copyright holders nor the names of its contributors
-      may be used to endorse or promote products derived from this software
-      without specific prior written permission.
-
-      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-      ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-      LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-      A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR
-      CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-      EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-      PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-      PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-      LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-      NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-      SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+   For the org.apache.seata.sqlparser.antlr.mysql.antlr.MySqlLexer.g4 and
+   org.apache.seata.sqlparser.antlr.mysql.antlr.MySqlParser.g4:
+
+   This product contains a portion of the antlr/grammars-v4 project, which is published at
+   https://github.com/antlr/grammars-v4. The code is licensed under an MIT License:
+
+      MySQL (Positive Technologies) grammar
+      The MIT License (MIT).
+      Copyright (c) 2015-2017, Ivan Kochurkin ([email protected]), Positive Technologies.
+      Copyright (c) 2017, Ivan Khudyashev ([email protected])
+
+      Permission is hereby granted, free of charge, to any person obtaining a copy
+      of this software and associated documentation files (the "Software"), to deal
+      in the Software without restriction, including without limitation the rights
+      to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+      copies of the Software, and to permit persons to whom the Software is
+      furnished to do so, subject to the following conditions:
+
+      The above copyright notice and this permission notice shall be included in
+      all copies or substantial portions of the Software.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+      IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+      FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+      AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+      LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+      OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+      THE SOFTWARE.

README.md

@@ -5,7 +5,7 @@
 # Seata: Simple Extensible Autonomous Transaction Architecture
 
 [![Build Status](https://github.com/apache/incubator-seata/workflows/build/badge.svg?branch=develop)](https://github.com/apache/incubator-seata/actions)
-[![codecov](https://codecov.io/gh/apache/incubator-seata/branch/develop/graph/badge.svg)](https://codecov.io/gh/apache/incubator-seata)
+[![codecov](https://codecov.io/gh/apache/incubator-seata/graph/badge.svg?token=tbmHt2ZfxO)](https://codecov.io/gh/apache/incubator-seata)
 [![license](https://img.shields.io/github/license/apache/incubator-seata.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
 [![maven](https://img.shields.io/maven-central/v/io.apache/incubator-seata-parent?versionSuffix=2.0.0)](https://search.maven.org/search?q=io.seata)
 
@@ -125,7 +125,7 @@ Please do not use our public issue tracker but refer to our [security policy](./
 
 ## Contributing
 
-Contributors are welcomed to join the Seata project. Please check [CONTRIBUTING](./CONTRIBUTING.md) and[CONTRIBUTING-CN](./CONTRIBUTING_CN.md)about how to contribute to this project.
+Contributors are welcomed to join the Seata project. Please check [CONTRIBUTING](./CONTRIBUTING.md) and [CONTRIBUTING-CN](./CONTRIBUTING_CN.md) about how to contribute to this project.
 
 
 ## Contact

all/pom.xml

@@ -146,6 +146,11 @@
             <artifactId>seata-discovery-etcd3</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.seata</groupId>
+            <artifactId>seata-discovery-namingserver</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.seata</groupId>
             <artifactId>seata-brpc</artifactId>

bom/pom.xml

@@ -126,6 +126,11 @@
                 <artifactId>seata-discovery-zk</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.seata</groupId>
+                <artifactId>seata-discovery-namingserver</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.seata</groupId>
                 <artifactId>seata-discovery-redis</artifactId>

build/pom.xml

@@ -71,7 +71,7 @@
 
     <properties>
         <!-- seata version -->
-        <revision>2.1.0-SNAPSHOT</revision>
+        <revision>2.2.0-SNAPSHOT</revision>
 
         <!-- Compiler settings properties -->
         <java.version>1.8</java.version>
@@ -88,6 +88,7 @@
         <kafka-appender.version>0.2.0-RC2</kafka-appender.version>
         <kafka-clients.version>3.6.1</kafka-clients.version>
         <snakeyaml.version>2.0</snakeyaml.version>
+        <jackson-mapper.version>1.9.13</jackson-mapper.version>
 
         <!-- For test -->
         <junit-jupiter.version>5.8.2</junit-jupiter.version>

changes/en-us/1.7.0.md

@@ -82,7 +82,7 @@ The version is updated as follows:
 - [[#5648](https://github.com/seata/seata/pull/5648)] optimize server logs print
 - [[#5647](https://github.com/seata/seata/pull/5647)] support case-sensitive attributes for table and column metadata
 - [[#5678](https://github.com/seata/seata/pull/5678)] optimize escape character for case of columnNames
-- [[#5684](https://github.com/seata/seata/pull/5684)] optimize github actions for CodeQL, skywalking-eyes and checkout
+- [[#5685](https://github.com/seata/seata/pull/5685)] optimize github actions for CodeQL, skywalking-eyes and checkout
 - [[#5700](https://github.com/seata/seata/pull/5700)] optimize distributed lock log