merge develop

apache · Nov 17, 2022 · 504fade · 504fade
2 parents 07dbfa8 + acf880a
commit 504fade
Show file tree

Hide file tree

Showing 348 changed files with 5,839 additions and 2,081 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,6 +7,24 @@ on:
     branches: [ develop, master ]
 
 jobs:
+  build_arm64-binary: 
+     runs-on: ubuntu-latest
+     if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}   
+     strategy:
+      fail-fast: false
+     steps:
+      - uses: actions/checkout@v2
+      - name: Set up QEMU
+        id: qemu
+        uses: docker/setup-qemu-action@v1
+      - name: Build arm-binary
+        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 -Prelease-seata -Dmaven.test.skip=true clean install -U'
+
   build:
     name: "build"
     runs-on: ubuntu-latest

diff --git a/.github/workflows/license-checker.yaml b/.github/workflows/license-checker.yaml
@@ -0,0 +1,27 @@
+name: License checker
+
+on:
+  pull_request:
+      branches: [ develop, master ]
+
+jobs:
+  check-license:
+    runs-on: ubuntu-latest
+    steps:
+      # step 1
+      - name: Checkout
+        uses: actions/[email protected]
+      # step 2
+      - name: Check License Header
+        uses: apache/skywalking-eyes/header@25edfc2fd8d52fb266653fb5f6c42da633d85c07
+        with:
+          log: info
+          config: .licenserc.yaml
+          mode: check
+      # step 3
+      - name: Check Dependencies' License
+        uses: apache/skywalking-eyes/dependency@25edfc2fd8d52fb266653fb5f6c42da633d85c07
+        with:
+          log: info
+          config: .licenserc.yaml
+          mode: check
diff --git a/.github/workflows/publishes.yml b/.github/workflows/publishes.yml
@@ -46,11 +46,11 @@ jobs:
       - name: "Package and Publish-Image-To-DockerHub"
         if: matrix.type == 'image'
         env:
+          IMAGE_NAME: openjdk:8u342
           REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
           REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
         run: |
-          echo "IMAGE_NAME=openjdk:8u332" >> $GITHUB_ENV;
-          if [ "${{github.ref}}" == "refs/heads/snapshot" ]; then
+          if [ "${{ github.ref_name }}" == "develop" ] || [ "${{ github.ref_name }}" == "snapshot" ]; then
             ./mvnw -T 4C clean package -Pimage               -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
           else
             ./mvnw -T 4C clean package -Pimage,release-image -DskipTests -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
@@ -49,3 +49,38 @@ jobs:
           else
             ./mvnw -T 4C clean test -Dspring-boot.version=${{ matrix.springboot }} -Dcheckstyle.skip=true  -Dlicense.skip=true  -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
           fi
+  arm64-test: 
+     runs-on: ubuntu-latest
+     strategy:
+      fail-fast: false
+      matrix:
+        springboot: [
+          2.7.2          -Dspring-framework.version=5.3.22,
+          2.6.10         -Dspring-framework.version=5.3.22,
+          2.5.14         -Dspring-framework.version=5.3.20,
+          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:
+      - uses: actions/checkout@v2
+      - name: Set up QEMU
+        id: qemu
+        uses: docker/setup-qemu-action@v1
+      - name: install
+        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'
+      - name: test-arm64
+        run: |
+            ./mvnw -T 4C clean test -Dspring-boot.version=${{ matrix.springboot }} -Dcheckstyle.skip=true  -Dlicense.skip=true  -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn          
diff --git a/.licenserc.yaml b/.licenserc.yaml
@@ -0,0 +1,86 @@
+#
+# 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
+#
+# 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
+    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
+      
+      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.
+
+  paths-ignore:
+    - '.gitignore'
+    - '.gitattributes'
+    - '.travis.yml'
+    - 'codecov.yml'
+    - 'CONTRIBUTING.md'
+    - 'CONTRIBUTING_CN.md'
+    - 'CODE_OF_CONDUCT.md'
+    - 'README.md'
+    - 'LICENSE'
+    - 'NOTICE'
+    - '**/*.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/io/seata/protocol/transcation/*.proto'
+    - 'saga/seata-saga-statemachine-designer/node_modules/**'
+    - 'node_modules/**'
+    - 'saga/seata-saga-statemachine-designer/**'
+    - '**/src/test/resources/statelang/**'
+    - 'console/src/main/resources/static/console-fe/**'
+    - '**/io/seata/sqlparser/antlr/**/*.g4'
+    - '**/io/seata/sqlparser/antlr/mysql/parser/*'
+    - '**/integration/**/*.proto'
+    - 'console/src/main/resources/static/**'
+    - 'ext/apm-seata-skywalking-plugin/config/agent.config'
+    - 'server/src/main/resources/lua/redislocker/redislock.lua'
+
+
+  comment: on-failure
+dependency:
+  files:
+    - pom.xml
+    - saga/seata-saga-statemachine-designer/package.json
+    - console/src/main/resources/static/console-fe/package.json
+  excludes:
+    - name: io.seata:*
diff --git a/all/pom.xml b/all/pom.xml
@@ -143,11 +143,6 @@
             <artifactId>seata-brpc</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>io.seata</groupId>
-            <artifactId>seata-dubbo</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-http</artifactId>
@@ -397,13 +392,12 @@
             <artifactId>commons-pool</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-            <scope>provided</scope>
+            <groupId>org.apache.dubbo.extensions</groupId>
+            <artifactId>dubbo-filter-seata</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo</artifactId>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -417,8 +411,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
         </dependency>
         <dependency>
             <groupId>aopalliance</groupId>
@@ -721,6 +715,7 @@
                             <dependencySourceIncludes>
                                 <dependencySourceInclude>io.seata:seata-*</dependencySourceInclude>
                             </dependencySourceIncludes>
+                            <additionalparam>-Xdoclint:none</additionalparam>
                         </configuration>
                         <executions>
                             <execution>

diff --git a/build/pom.xml b/build/pom.xml
@@ -82,7 +82,7 @@
         <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
         <!-- Compiler -->
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
-        <protobuf-maven-plugin.version>0.5.0</protobuf-maven-plugin.version>
+        <protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
         <kotlin-maven-plugin.version>1.3.72</kotlin-maven-plugin.version>
         <!-- Check -->
         <maven-pmd-plugin.version>3.8</maven-pmd-plugin.version>
@@ -234,6 +234,7 @@
                         <exclude>**/META-INF/additional-spring-configuration-metadata.json</exclude>
                         <exclude>protobuf/**</exclude>
                         <exclude>**/*.proto</exclude>
+                        <exclude>static/console-fe/**</exclude>
                     </excludes>
                 </configuration>
             </plugin>

diff --git a/changes/en-us/1.5.2.md b/changes/en-us/1.5.2.md
@@ -47,6 +47,8 @@ The version is updated as follows:
 - [[#4626](https://github.com/seata/seata/pull/4626)] Replace `flatten-maven-plugin` with `easyj-maven-plugin` to fix the conflict between `shade` and `flatten`
 - [[#4629](https://github.com/seata/seata/pull/4629)] check relation of before status and after status when updating global session
 - [[#4662](https://github.com/seata/seata/pull/4662)] make EnhancedServiceLoader more readable
+- [[#4445](https://github.com/seata/seata/pull/4445)] optimize transaction timeout judgment
+- [[#4958](https://github.com/seata/seata/pull/4958)] do not execute triggerAfterCommit() in case of timeout
 
 ### test:
 
@@ -73,6 +75,7 @@ Thanks to these contributors for their code commits. Please report an unintended
 - [AYue-94](https://github.com/AYue-94)
 - [lingxiao-wu](https://github.com/lingxiao-wu)
 - [caohdgege](https://github.com/caohdgege)
+- [miaoxueyu](https://github.com/miaoxueyu)
 
 
 Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.

diff --git a/changes/en-us/2.0.0.md b/changes/en-us/2.0.0.md
@@ -25,7 +25,6 @@ The version is updated as follows:
   - [[#4567](https://github.com/seata/seata/pull/4567)] Support where method condition(find_in_set)
   - [[#4629](https://github.com/seata/seata/pull/4629)] check relation of before status and after status when updating global session
 
-
 ### test:
   - [[#1234](https://github.com/seata/seata/pull/1234)] Please delete the sample later
 

diff --git a/changes/en-us/develop.md b/changes/en-us/develop.md
@@ -4,10 +4,39 @@ Add changes here for all PR submitted to the develop branch.
 
 ### feature:
 - [[#4802](https://github.com/seata/seata/pull/4802)] dockerfile support arm64
+- [[#4863](https://github.com/seata/seata/pull/4863)] support oracle and postgresql multi primary key
+- [[#4649](https://github.com/seata/seata/pull/4649)] seata-server support multiple registry
+- [[#4479](https://github.com/seata/seata/pull/4479)] TCC mode supports tcc annotation marked on both interface and implementation class
+- [[#4877](https://github.com/seata/seata/pull/4877)] seata client support jdk17
+- [[#4468](https://github.com/seata/seata/pull/4968)] support kryo 5.3.0
+- [[#4914](https://github.com/seata/seata/pull/4914)] support mysql update join sql
 
 
 ### bugfix:
+- [[#4780](https://github.com/seata/seata/pull/4780)] fix can't post TimeoutRollbacked event after a successful timeout rollback
+- [[#4954](https://github.com/seata/seata/pull/4954)] fix output expression incorrectly throws npe
 - [[#4817](https://github.com/seata/seata/pull/4817)] fix in high version springboot property not Standard
+- [[#4838](https://github.com/seata/seata/pull/4838)] fix when use Statement.executeBatch() can not generate undo log
+- [[#4533](https://github.com/seata/seata/pull/4533)] fix rollback event repeated and some event status not correct
+- [[#4779](https://github.com/seata/seata/pull/4779)] fix and support Apache Dubbo 3
+- [[#4912](https://github.com/seata/seata/pull/4912)] fix mysql InsertOnDuplicateUpdate column case is different and cannot be matched
+- [[#4543](https://github.com/seata/seata/pull/4543)] fix support Oracle nclob types
+- [[#4915](https://github.com/seata/seata/pull/4915)] fix failed to get server recovery properties
+- [[#4919](https://github.com/seata/seata/pull/4919)] fix XID port  and  address null:0 before coordinator.init
+- [[#4928](https://github.com/seata/seata/pull/4928)] fix rpcContext.getClientRMHolderMap NPE 
+- [[#4953](https://github.com/seata/seata/pull/4953)] fix InsertOnDuplicateUpdate bypass modify pk
+- [[#4978](https://github.com/seata/seata/pull/4978)] fix kryo support circular reference
+- [[#4874](https://github.com/seata/seata/pull/4874)] fix startup failure of Server1.5.2 by using OpenJDK 11 
+- [[#5018](https://github.com/seata/seata/pull/5018)] fix loader path in startup scripts
+- [[#5004](https://github.com/seata/seata/pull/5004)] fix duplicate image row for update join
+- [[#5032](https://github.com/seata/seata/pull/5032)] fix mysql InsertOnDuplicateUpdate sql query error caused by placeholder index calculation error
+- [[#5033](https://github.com/seata/seata/pull/5033)] fix null exception when sql columns is empty for insert on duplicate
+- [[#5033](https://github.com/seata/seata/pull/5023)] fix mysql InsertOnDuplicateUpdate insert value type recognize error
+- [[#5038](https://github.com/seata/seata/pull/5038)] remove @EnableConfigurationProperties({SagaAsyncThreadPoolProperties.class})
+- [[#5050](https://github.com/seata/seata/pull/5050)] fix global session is not change to Committed in saga mode
+- [[#5031](https://github.com/seata/seata/pull/5031)] fix mysql InsertOnDuplicateUpdate should not use null index value as image sql query condition
+- [[#5075](https://github.com/seata/seata/pull/5075)] fix InsertOnDuplicateUpdateExecutor could not intercept the sql which has no primary and unique key
+
 
 ### optimize:
 - [[#4774](https://github.com/seata/seata/pull/4774)] optimize mysql8 dependencies for seataio/seata-server image
@@ -16,6 +45,28 @@ Add changes here for all PR submitted to the develop branch.
 - [[#4750](https://github.com/seata/seata/pull/4750)] optimize unBranchLock romove xid
 - [[#4797](https://github.com/seata/seata/pull/4797)] optimize the github actions
 - [[#4800](https://github.com/seata/seata/pull/4800)] Add NOTICE as Apache License V2
+- [[#4761](https://github.com/seata/seata/pull/4761)] use hget replace hmget because only one field
+- [[#4414](https://github.com/seata/seata/pull/4414)] exclude log4j dependencies
+- [[#4836](https://github.com/seata/seata/pull/4836)] optimize BaseTransactionalExecutor#buildLockKey(TableRecords rowsIncludingPK) method more readable
+- [[#4865](https://github.com/seata/seata/pull/4865)] fix some security vulnerabilities in GGEditor
+- [[#4590](https://github.com/seata/seata/pull/4590)] auto degrade enable to dynamic configure
+- [[#4490](https://github.com/seata/seata/pull/4490)] tccfence log table delete by index
+- [[#4911](https://github.com/seata/seata/pull/4911)] add license checker workflow
+- [[#4917](https://github.com/seata/seata/pull/4917)] upgrade package-lock.json fix vulnerabilities
+- [[#4924](https://github.com/seata/seata/pull/4924)] optimize pom dependencies
+- [[#4932](https://github.com/seata/seata/pull/4932)] extract the default values for some properties
+- [[#4925](https://github.com/seata/seata/pull/4925)] optimize java doc warning
+- [[#4921](https://github.com/seata/seata/pull/4921)] fix some vulnerabilities in console and upgrade skywalking-eyes
+- [[#4936](https://github.com/seata/seata/pull/4936)] optimize read of storage configuration
+- [[#4946](https://github.com/seata/seata/pull/4946)] pass the sqlexception to client when get lock
+- [[#4962](https://github.com/seata/seata/pull/4962)] optimize build and fix the base image
+- [[#4974](https://github.com/seata/seata/pull/4974)] optimize cancel the limit on the number of globalStatus queries in Redis mode
+- [[#4981](https://github.com/seata/seata/pull/4981)] optimize tcc fence record not exists errMessage
+- [[#4985](https://github.com/seata/seata/pull/4985)] fix undo_log id repeat
+- [[#4995](https://github.com/seata/seata/pull/4995)] fix mysql InsertOnDuplicateUpdate duplicate pk condition in after image query sql
+- [[#5047](https://github.com/seata/seata/pull/5047)] remove useless code
+- [[#5051](https://github.com/seata/seata/pull/5051)] undo log dirty throw BranchRollbackFailed_Unretriable
+- [[#5075](https://github.com/seata/seata/pull/5075)] intercept the InsertOnDuplicateUpdate statement which has no primary key and unique index value
 
 ### test:
 - [[#4794](https://github.com/seata/seata/pull/4794)] try to fix the test `DataSourceProxyTest.getResourceIdTest()`
@@ -25,9 +76,26 @@ Thanks to these contributors for their code commits. Please report an unintended
 
 <!-- Please make sure your Github ID is in the list below -->
 - [slievrly](https://github.com/slievrly)
+- [tuwenlin](https://github.com/tuwenlin)
 - [lcmvs](https://github.com/lcmvs)
 - [wangliang181230](https://github.com/wangliang181230)
 - [a364176773](https://github.com/a364176773)
 - [AlexStocks](https://github.com/AlexStocks)
 - [liujunlin5168](https://github.com/liujunlin5168)
+- [pengten](https://github.com/pengten)
+- [liuqiufeng](https://github.com/liuqiufeng)
+- [yujianfei1986](https://github.com/yujianfei1986)
+- [Bughue](https://github.com/Bughue)
+- [AlbumenJ](https://github.com/AlbumenJ)
+- [doubleDimple](https://github.com/doubleDimple)
+- [jsbxyyx](https://github.com/jsbxyyx)
+- [tuwenlin](https://github.com/tuwenlin)
+- [CrazyLionLi](https://github.com/JavaLionLi)
+- [whxxxxx](https://github.com/whxxxxx)
+- [renliangyu857](https://github.com/renliangyu857)
+- [neillee95](https://github.com/neillee95)
+- [crazy-sheep](https://github.com/crazy-sheep)
+- [zhangzq7](https://github.com/zhangzq7)
+- [l81893521](https://github.com/l81893521)
+
 Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.
diff --git a/changes/zh-cn/1.5.2.md b/changes/zh-cn/1.5.2.md
@@ -47,6 +47,8 @@ Seata 是一款开源的分布式事务解决方案，提供高性能和简单
 - [[#4626](https://github.com/seata/seata/pull/4626)] 使用 `easyj-maven-plugin` 插件代替 `flatten-maven-plugin`插件，以修复`shade` 插件与 `flatten` 插件不兼容的问题
 - [[#4629](https://github.com/seata/seata/pull/4629)] 更新globalSession状态时检查更改前后的约束关系
 - [[#4662](https://github.com/seata/seata/pull/4662)] 优化 EnhancedServiceLoader 可读性
+- [[#4445](https://github.com/seata/seata/pull/4445)] 优化事务超时判断
+- [[#4958](https://github.com/seata/seata/pull/4958)] 优化当本地事务超时回滚后after commit事件被调用
 
 
 ### test：
@@ -75,6 +77,7 @@ Seata 是一款开源的分布式事务解决方案，提供高性能和简单
 - [AYue-94](https://github.com/AYue-94)
 - [lingxiao-wu](https://github.com/lingxiao-wu)
 - [caohdgege](https://github.com/caohdgege)
+- [miaoxueyu](https://github.com/miaoxueyu)
 
 同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。