Merge branch '2.x' into undolog_6451

jsbxyyx · Jul 10, 2024 · 542697c · 542697c
2 parents eaf2636 + 520a5cf
commit 542697c
Show file tree

Hide file tree

Showing 372 changed files with 11,270 additions and 1,527 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -51,6 +51,9 @@ github:
       required_pull_request_reviews:
         dismiss_stale_reviews: false
         required_approving_review_count: 1
+  protected_tags:
+    - "v0.*.*"
+    - "v1.*.*"
 notifications:
   commits: notifications@seata.apache.org
   issues: notifications@seata.apache.org

diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,19 @@
+# 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.
+#
+
 *.js linguist-language=java
 *.css linguist-language=java
 *.html linguist-language=java
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -39,20 +39,23 @@ jobs:
         if: matrix.java == '8'
         run: |
           ./mvnw -T 4C clean test \
-                 -Dcheckstyle.skip=false -Dpmd.skip=false -Dlicense.skip=false \
-                 -Dmaven.git-commit-id.skip=true -DredisCaseEnabled=true \
+                 -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
       - name: "Test with Maven and Java${{ matrix.java }}"
         if: matrix.java != '8'
         run: |
           ./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
+        uses: codecov/codecov-action@v4.0.1
+        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:
@@ -82,5 +85,4 @@ jobs:
                        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'
diff --git a/.github/workflows/test-druid.yml b/.github/workflows/test-druid.yml
@@ -59,5 +59,4 @@ jobs:
         run: |
           ./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;
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,7 +3,6 @@ name: "test"
 on:
   push:
     branches: [ test*, "*.*.*" ]
-
 jobs:
   # job 1
   test:
@@ -43,18 +42,17 @@ jobs:
       - name: "Test with Maven on '${{ matrix.os }}' OS"
         if: matrix.os != 'windows'
         run: |
-          ./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;
+          if [ "${{ matrix.os }}" == "macos" ]; then
+            ./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
       - 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;
+          ./mvnw.cmd clean install -P args-for-client-test -DskipTests -D spring-boot.version=${{ matrix.springboot }} -e -B -D org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
 
   # job 2
   test-springboot3x:
@@ -89,18 +87,17 @@ jobs:
       - name: "Test with Maven on '${{ matrix.os }}' OS"
         if: matrix.os != 'windows'
         run: |
-          ./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;
+          if [ "${{ matrix.os }}" == "macos" ]; then
+            ./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
       - 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;
+          ./mvnw.cmd clean install -P args-for-client-test -DskipTests -D spring-boot.version=${{ matrix.springboot }} -e -B -D org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
 
   # job 3
   test-arm64:
@@ -139,5 +136,4 @@ jobs:
                            -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'
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ target/
 *.class
 .flattened-pom.xml
 dependency-reduced-pom.xml
+.mvn/wrapper/maven-wrapper.jar
 
 # eclipse ignore
 .settings/

diff --git a/.licenserc.yaml b/.licenserc.yaml
@@ -37,36 +37,18 @@ header:
 
   paths-ignore:
     - '.gitignore'
-    - '.gitattributes'
-    - '.travis.yml'
-    - 'codecov.yml'
-    - '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'
-    - 'mvnw'
-    - 'mvnw.cmd'
-    - '*.sh'
     - 'changes/**'
     - 'style/**'
-    - 'script/**'
-    - 'seata-plugins/**'
-    - '.mvn/**'
     - 'sessionStore/**'
-    - 'distribution/LICENSE-BIN'
-    - 'distribution/NOTICE-BIN'
     - '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/**'
@@ -80,8 +62,6 @@ header:
     - 'server/src/main/resources/lua/redislocker/redislock.lua'
     - 'server/src/main/resources/banner.txt'
     - '**/*.json'
-
-
   comment: on-failure
 dependency:
   files:

diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1,18 @@
+# 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
+#
+#   https://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.
 distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,18 @@
+# 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.
+#
 language: java
 sudo: false # faster builds
 

diff --git a/LICENSE b/LICENSE
@@ -200,19 +200,39 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
-=======================================================================
-Seata Subcomponents:
-
-The Seata project contains subcomponents with separate copyright
-notices and license terms. Your use of the source code for the these
-subcomponents is subject to the terms and conditions of the following
-licenses.
-
-========================================================================
-Apache 2.0 licenses
-========================================================================
-
-The following components are provided under the Apache License. See project link for details.
-The text of each license is the standard Apache 2.0 license.
-
-    Apache: skywalking 8.4.0: https://github.com/apache/skywalking, Apache 2.0
+   =======================================================================
+   Apache Seata(incubating) Subcomponents:
+
+   The Apache Seata(incubating) project contains subcomponents with separate copyright
+   notices and license terms. Your use of the source code for the these
+   subcomponents is subject to the terms and conditions of the following
+   licenses.
+
+   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 (kvanttt@gmail.com), Positive Technologies.
+      Copyright (c) 2017, Ivan Khudyashev (IHudyashov@ptsecurity.com)
+
+      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.
diff --git a/all/pom.xml b/all/pom.xml
@@ -568,11 +568,6 @@
             <artifactId>grpc-stub</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>

diff --git a/build/pom.xml b/build/pom.xml
@@ -20,8 +20,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.apache</groupId>
+        <artifactId>apache</artifactId>
+        <version>19</version>
+        <relativePath/>
+    </parent>
     <modelVersion>4.0.0</modelVersion>
-
     <groupId>org.apache.seata</groupId>
     <artifactId>seata-build</artifactId>
     <packaging>pom</packaging>
@@ -130,12 +135,9 @@
         <license.skip>true</license.skip>
         <pmd.skip>true</pmd.skip>
         <maven.test.skip>false</maven.test.skip>
-        <maven.git-commit-id.skip>false</maven.git-commit-id.skip>
+        <maven.git-commit-id.skip>true</maven.git-commit-id.skip>
         <maven.surefire.argLine></maven.surefire.argLine>
         <maven.surefire.excludes></maven.surefire.excludes>
-        <gpg.keyname>37F181C60AACE24BD5C1D3925583F79497E8E293</gpg.keyname>
-        <gpg.arg1/>
-        <gpg.arg2/>
 
         <!-- For docker image-->
         <image.publish.skip>true</image.publish.skip>
@@ -352,6 +354,9 @@
         <!-- profile: release -->
         <profile>
             <id>release</id>
+            <properties>
+                <maven.git-commit-id.skip>false</maven.git-commit-id.skip>
+            </properties>
             <build>
                 <plugins>
                     <!-- Javadoc -->
@@ -372,18 +377,6 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <!-- Staging -->
-                    <plugin>
-                        <groupId>org.sonatype.plugins</groupId>
-                        <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>${nexus-staging-maven-plugin.version}</version>
-                        <extensions>true</extensions>
-                        <configuration>
-                            <serverId>oss_seata</serverId>
-                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                            <autoReleaseAfterClose>false</autoReleaseAfterClose>
-                        </configuration>
-                    </plugin>
                     <!-- GPG -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -396,29 +389,11 @@
                                 <goals>
                                     <goal>sign</goal>
                                 </goals>
-                                <configuration>
-                                    <keyname>${gpg.keyname}</keyname>
-                                    <gpgArguments>
-                                        <arg>${gpg.arg1}</arg>
-                                        <arg>${gpg.arg2}</arg>
-                                    </gpgArguments>
-                                </configuration>
                             </execution>
                         </executions>
                     </plugin>
                 </plugins>
             </build>
-            <!-- distribution management -->
-            <distributionManagement>
-                <repository>
-                    <id>oss_seata</id>
-                    <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-                </repository>
-                <snapshotRepository>
-                    <id>oss_seata</id>
-                    <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-                </snapshotRepository>
-            </distributionManagement>
         </profile>
 
         <!-- profile: release-by-github-actions -->
@@ -427,6 +402,7 @@
             <properties>
                 <gpg.arg1>--pinentry-mode</gpg.arg1>
                 <gpg.arg2>loopback</gpg.arg2>
+                <maven.git-commit-id.skip>false</maven.git-commit-id.skip>
             </properties>
         </profile>