Merge branch '2.x' into delete_unnecessary_cached_data

.github/workflows/build.yml

@@ -7,7 +7,7 @@ on:
     branches: [ 2.x, develop, master ]
 
 jobs:
-  # job 1: Test based on java 8 and 17. Do not checkstyle.
+  # job 1: Test based on java 8, 17 and 21. Do not checkstyle.
   build:
     name: "build"
     services:
@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 8, 17 ]
+        java: [ 8, 17, 21 ]
     steps:
       # step 1
       - name: "Checkout"

.licenserc.yaml

@@ -61,6 +61,7 @@ header:
     - 'ext/apm-seata-skywalking-plugin/config/agent.config'
     - 'server/src/main/resources/lua/redislocker/redislock.lua'
     - 'server/src/main/resources/banner.txt'
+    - 'namingserver/src/main/resources/banner.txt'
     - '**/*.json'
   comment: on-failure
 dependency:

README.md

@@ -7,7 +7,7 @@
 [![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/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/org.apache.seata/seata-all?versionSuffix=2.1.0)](https://central.sonatype.com/search?q=org.apache.seata%3Aseata-all)
+[![maven](https://img.shields.io/maven-central/v/org.apache.seata/seata-all?versionSuffix=2.2.0)](https://central.sonatype.com/search?q=org.apache.seata%3Aseata-all)
 
 ## What is Seata?
 
@@ -85,7 +85,7 @@ For more details about principle and design, please go to [Seata wiki page](http
 Depending on the scenario, choose one of the two dependencies: `org.apache.seata:seata-all` or `org.apache.seata:seata-spring-boot-starter`.
 ```xml
 <properties>
-  <seata.version>2.1.0</seata.version>
+  <seata.version>2.2.0</seata.version>
 </properties>
 
 <dependencies>

all/pom.xml

@@ -262,6 +262,11 @@
             <artifactId>seata-hsf</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.seata</groupId>
+            <artifactId>seata-serializer-fury</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.seata</groupId>
             <artifactId>seata-serializer-kryo</artifactId>
@@ -339,6 +344,11 @@
             <artifactId>seata-saga-spring</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.seata</groupId>
+            <artifactId>seata-saga-annotation</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-all</artifactId>

bom/pom.xml

@@ -348,6 +348,11 @@
                 <artifactId>seata-saga-engine-store</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.seata</groupId>
+                <artifactId>seata-saga-annotation</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.seata</groupId>
                 <artifactId>seata-sqlparser-core</artifactId>

build/pom.xml

@@ -71,7 +71,7 @@
 
     <properties>
         <!-- seata version -->
-        <revision>2.3.0-SNAPSHOT</revision>
+        <revision>2.4.0-SNAPSHOT</revision>
 
         <!-- Compiler settings properties -->
         <java.version>1.8</java.version>
@@ -147,6 +147,7 @@
         <image.tags>latest</image.tags>
 
         <dependencies.copy.skip>true</dependencies.copy.skip>
+        <mysql.copy.skip>true</mysql.copy.skip>
     </properties>
 
     <build>

changes/en-us/2.3.0.md

@@ -0,0 +1,128 @@
+### 2.3.0
+
+<details>
+  <summary><mark>Release notes</mark></summary>	
+
+### Apache Seata(incubating) 2.3.0
+
+Seata 2.3.0 Released.
+
+Seata is an easy-to-use, high-performance, open source distributed transaction solution.
+
+The version is updated as follows:
+
+### feature:
+
+- [[#6904](https://github.com/apache/incubator-seata/pull/6904)] add fastjson2 serializer support
+- [[#6876](https://github.com/apache/incubator-seata/pull/6876)] support kingbase
+- [[#6881](https://github.com/apache/incubator-seata/pull/6881)] support grpc
+- [[#6864](https://github.com/apache/incubator-seata/pull/6864)] support shentong database
+- [[#6974](https://github.com/apache/incubator-seata/pull/6974)] support fastjson2 undolog parser
+- [[#6992](https://github.com/apache/incubator-seata/pull/6992)] support grpc serializer
+- [[#6973](https://github.com/apache/incubator-seata/pull/6973)] support saga annotation
+- [[#6926](https://github.com/apache/incubator-seata/pull/6926)] support ssl communication for raft nodes
+
+### bugfix:
+
+- [[#6899](https://github.com/apache/incubator-seata/pull/6899)] fix file.conf read failed after package
+- [[#6890](https://github.com/apache/incubator-seata/pull/6890)] fix designerJson to standardJson: subStateMachine
+  compensateState cannot be recognized
+- [[#6907](https://github.com/apache/incubator-seata/pull/6907)] fix the issue of Codecov not generating reports
+- [[#6923](https://github.com/apache/incubator-seata/pull/6923)] Enhance 401 Error Handling by Refreshing Token
+- [[#6925](https://github.com/apache/incubator-seata/pull/6925)] fix the issue in Raft model a follower's crash may lead
+  to the continued use of expired tokens
+- [[#6932](https://github.com/apache/incubator-seata/pull/6932)] when enabling local transactions, the lock contention
+  failure in file & raft mode does not exit, leading to a lingering lock
+- [[#6940](https://github.com/apache/incubator-seata/pull/6940)] Fix NacosRegistry lookup behavior
+  transactionServiceGroup is empty causing NPE error
+- [[#6943](https://github.com/apache/incubator-seata/pull/6943)] fix the conversion error for `convertBranchSession` in
+  concurrent environment.
+- [[#6948](https://github.com/apache/incubator-seata/pull/6948)] Fix the CI build issue on the ARM64 platform
+- [[#6947](https://github.com/apache/incubator-seata/pull/6947)] fix npe for nacos registry when look up address
+- [[#6984](https://github.com/apache/incubator-seata/pull/6984)] support building docker image on openjdk23
+- [[#6994](https://github.com/apache/incubator-seata/pull/6994)] fix the problem of building undoLog exception when
+  update join does not update data
+- [[#7005](https://github.com/apache/incubator-seata/pull/7005)] fix the Raft NPE issue caused by two-phase concurrency
+- [[#7010](https://github.com/apache/incubator-seata/pull/7010)] fix error while the "context" is key word in DM8 when
+  delete undolog
+- [[#7022](https://github.com/apache/incubator-seata/pull/7022)] fix `store.mode` property
+  in `application.raft.example.yml`
+- [[#7025](https://github.com/apache/incubator-seata/pull/7025)] fix vGroupMappingManager is NOT init
+- [[#7044](https://github.com/apache/incubator-seata/pull/7044)] fix tableMeta refresh after closed
+-
+
+### optimize:
+
+- [[#6826](https://github.com/apache/incubator-seata/pull/6826)] remove the branch registration operation of the XA
+  read-only transaction
+- [[#6874](https://github.com/apache/incubator-seata/pull/6874)] modify the version to 2.3.0-SNAPSHOT
+- [[#6892](https://github.com/apache/incubator-seata/pull/6892)] upgrade npmjs version in console module
+- [[#6883](https://github.com/apache/incubator-seata/pull/6874)] remove write only object
+- [[#6892](https://github.com/apache/incubator-seata/pull/6892)] upgrade npmjs version
+- [[#6889](https://github.com/apache/incubator-seata/pull/6889)] Correct word spelling errors
+- [[#6898](https://github.com/apache/incubator-seata/pull/6898)] upgrade npmjs version in saga module
+- [[#6879](https://github.com/apache/incubator-seata/pull/6879)] fix log argument mismatch issue
+- [[#6902](https://github.com/apache/incubator-seata/pull/6900)] optimize readme docs
+- [[#6807](https://github.com/apache/incubator-seata/pull/6807)] splitting MergedWarpMessage enhances the server
+  parallel processing capability
+- [[#6905](https://github.com/apache/incubator-seata/pull/6905)] remove incompatible licenses at build time
+- [[#6906](https://github.com/apache/incubator-seata/pull/6906)] h2 dependency adds test scope
+- [[#6911](https://github.com/apache/incubator-seata/pull/6911)] fix some typos in project
+- [[#6918](https://github.com/apache/incubator-seata/pull/6918)] Use the openjdk image of eclipse-temurin as the base
+  image
+- [[#6938](https://github.com/apache/incubator-seata/pull/6938)] Update online chat information in README.md
+- [[#6950](https://github.com/apache/incubator-seata/pull/6950)] Remove JVM parameter app.id
+- [[#6959](https://github.com/apache/incubator-seata/pull/6959)] update the naming and description for
+  the `seata-http-jakarta` module
+- [[#6991](https://github.com/apache/incubator-seata/pull/6991)] gRPC serialization default to Protobuf
+- [[#6993](https://github.com/apache/incubator-seata/pull/6993)] optimize transaction metrics
+- [[#6995](https://github.com/apache/incubator-seata/pull/6995)] upgrade outdate npmjs dependencies
+- [[#6996](https://github.com/apache/incubator-seata/pull/6996)] optimize lock release logic in AT transaction mode
+- [[#7023](https://github.com/apache/incubator-seata/pull/7023)] optimize fail fast, when all server not available
+- [[#7027](https://github.com/apache/incubator-seata/pull/7027)] raft mode maintains the reload logic consistent with
+  the file
+- [[#6891](https://github.com/apache/incubator-seata/pull/6891)] add StateType Enum
+- [[#7040](https://github.com/apache/incubator-seata/pull/7040)] optimize the print info in ConfigurationFactory
+- [[#7046](https://github.com/apache/incubator-seata/pull/7046)] remove the dependency conflict for spring-webmvc
+- [[#7043](https://github.com/apache/incubator-seata/pull/7043)] finish rollback if sendResult/msg not found
+- [[#7051](https://github.com/apache/incubator-seata/pull/7051)] add namingserver jib
+- [[#7054](https://github.com/apache/incubator-seata/pull/7054)] In file mode when the lock cannot be acquired output
+  the holder's xid
+
+### refactor:
+
+- [[#7017](https://github.com/apache/incubator-seata/pull/7017)] remove dependency on seata-server module
+
+### test:
+
+- [[#6869](https://github.com/apache/incubator-seata/pull/6869)] Add unit tests for the `seata-core` module
+- [[#6927](https://github.com/apache/incubator-seata/pull/6927)] Add unit tests for the `seata-rocketmq` module
+- [[#7018](https://github.com/apache/incubator-seata/pull/7018)] Add unit tests for the `seata-tm` module
+- [[#7030](https://github.com/apache/incubator-seata/pull/7030)] Add unit tests for the `seata-common` module
+
+Thanks to these contributors for their code commits. Please report an unintended omission.
+
+<!-- Please make sure your Github ID is in the list below -->
+
+- [slievrly](https://github.com/slievrly)
+- [GoodBoyCoder](https://github.com/GoodBoyCoder)
+- [funky-eyes](https://github.com/funky-eyes)
+- [dk2k](https://github.com/dk2k)
+- [MaoMaoandSnail](https://github.com/MaoMaoandSnail)
+- [yougecn](https://github.com/yougecn)
+- [arrrnold17](https://github.com/arrrnold17)
+- [xjlgod](https://github.com/xjlgod)
+- [PleaseGiveMeTheCoke](https://github.com/PleaseGiveMeTheCoke)
+- [dsomehan](https://github.com/dsomehan)
+- [psxjoy](https://github.com/psxjoy)
+- [xingfudeshi](https://github.com/xingfudeshi)
+- [o-jimin](https://github.com/o-jimin)
+- [lixingjia77](https://github.com/lixingjia77)
+- [whaon](https://github.com/whaon)
+- [YvCeung](https://github.com/YvCeung)
+- [jsbxyyx](https://github.com/jsbxyyx)
+- [lightClouds917](https://github.com/lightClouds917)
+- [Muluo-cyan](https://github.com/Muluo-cyan)
+- [yixia](https://github.com/wt-better)
+
+Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.

changes/en-us/2.x.md

@@ -3,71 +3,45 @@ Add changes here for all PR submitted to the 2.x branch.
 <!-- Please add the `changes` to the following location(feature/bugfix/optimize/test) based on the type of PR -->
 
 ### feature:
-- [[#6904](https://github.com/apache/incubator-seata/pull/6904)] add fastjson2 serializer support
-- [[#6876](https://github.com/apache/incubator-seata/pull/6876)] support kingbase
-- [[#6881](https://github.com/apache/incubator-seata/pull/6881)] support grpc
-- [[#6864](https://github.com/apache/incubator-seata/pull/6864)] support shentong database
-- [[#6974](https://github.com/apache/incubator-seata/pull/6974)] support fastjson2 undolog parser
 
+- [[#7037](https://github.com/apache/incubator-seata/pull/7037)] support fury undolog parser
+- [[#7069](https://github.com/apache/incubator-seata/pull/7069)] Raft cluster mode supports address translation
+- [[#7038](https://github.com/apache/incubator-seata/pull/7038)] support fury serializer
 
 ### bugfix:
-- [[#6899](https://github.com/apache/incubator-seata/pull/6899)] fix file.conf read failed after package
-- [[#6890](https://github.com/apache/incubator-seata/pull/6890)] fix designerJson to standardJson: subStateMachine compensateState cannot be recognized
-- [[#6907](https://github.com/apache/incubator-seata/pull/6907)] fix the issue of Codecov not generating reports
-- [[#6923](https://github.com/apache/incubator-seata/pull/6923)] Enhance 401 Error Handling by Refreshing Token
-- [[#6925](https://github.com/apache/incubator-seata/pull/6925)] fix the issue in Raft model a follower's crash may lead to the continued use of expired tokens
-- [[#6932](https://github.com/apache/incubator-seata/pull/6932)] when enabling local transactions, the lock contention failure in file & raft mode does not exit, leading to a lingering lock
-- [[#6940](https://github.com/apache/incubator-seata/pull/6940)] Fix NacosRegistry lookup behavior transactionServiceGroup is empty causing NPE error
-- [[#6943](https://github.com/apache/incubator-seata/pull/6943)] fix the conversion error for `convertBranchSession` in concurrent environment.
-- [[#6948](https://github.com/apache/incubator-seata/pull/6948)] Fix the CI build issue on the ARM64 platform
-- [[#6947](https://github.com/apache/incubator-seata/pull/6947)] fix npe for nacos registry when look up address
-- [[#6984](https://github.com/apache/incubator-seata/pull/6984)] support building docker image on openjdk23
 
-### optimize:
-- [[#6826](https://github.com/apache/incubator-seata/pull/6826)] remove the branch registration operation of the XA read-only transaction
-- [[#6874](https://github.com/apache/incubator-seata/pull/6874)] modify the version to 2.3.0-SNAPSHOT
-- [[#6892](https://github.com/apache/incubator-seata/pull/6892)] upgrade npmjs version in console module
-- [[#6883](https://github.com/apache/incubator-seata/pull/6874)] remove write only object
-- [[#6892](https://github.com/apache/incubator-seata/pull/6892)] upgrade npmjs version
-- [[#6889](https://github.com/apache/incubator-seata/pull/6889)] Correct word spelling errors
-- [[#6898](https://github.com/apache/incubator-seata/pull/6898)] upgrade npmjs version in saga module
-- [[#6879](https://github.com/apache/incubator-seata/pull/6879)] fix log argument mismatch issue
-- [[#6902](https://github.com/apache/incubator-seata/pull/6900)] optimize readme docs
-- [[#6807](https://github.com/apache/incubator-seata/pull/6807)] splitting MergedWarpMessage enhances the server parallel processing capability
-- [[#6905](https://github.com/apache/incubator-seata/pull/6905)] remove incompatible licenses at build time
-- [[#6906](https://github.com/apache/incubator-seata/pull/6906)] h2 dependency adds test scope 
-- [[#6911](https://github.com/apache/incubator-seata/pull/6911)] fix some typos in project
-- [[#6918](https://github.com/apache/incubator-seata/pull/6918)] Use the openjdk image of eclipse-temurin as the base image
-- [[#6938](https://github.com/apache/incubator-seata/pull/6938)] Update online chat information in README.md 
-- [[#6950](https://github.com/apache/incubator-seata/pull/6950)] Remove JVM parameter app.id
-- [[#6959](https://github.com/apache/incubator-seata/pull/6959)] update the naming and description for the `seata-http-jakarta` module
+- [[#PR_NO](https://github.com/apache/incubator-seata/pull/#PR_NO)] fix XXX
 
+### optimize:
 
-### refactor:
+- [[#6828](https://github.com/apache/incubator-seata/pull/6828)] spring boot compatible with file.conf and registry.conf
+- [[#7012](https://github.com/apache/incubator-seata/pull/7012)] When the number of primary keys exceeds 1000, use union to concatenate the SQL
+- [[#7075](https://github.com/apache/incubator-seata/pull/7075)] fast fail when channel is null
+- [[#7089](https://github.com/apache/incubator-seata/pull/7089)] support instance registration to the registry center
+- [[#7093](https://github.com/apache/incubator-seata/pull/7093)] add a test workflow for JDK 21
 
 ### security:
 
+- [[#PR_NO](https://github.com/apache/incubator-seata/pull/PR_NO)] upgrade XXX
+
 ### test:
-- [[#6927](https://github.com/apache/incubator-seata/pull/6927)] Add unit tests for the `seata-rocketmq` module
+
+- [[#7092](https://github.com/apache/incubator-seata/pull/7092)] fix the issue of NacosMockTest failing to run
+
+### refactor:
+
+- [[#PR_NO](https://github.com/apache/incubator-seata/pull/PR_NO)] refactor XXX
 
 Thanks to these contributors for their code commits. Please report an unintended omission.
 
 <!-- Please make sure your Github ID is in the list below -->
+
 - [slievrly](https://github.com/slievrly)
+- [lyl2008dsg](https://github.com/lyl2008dsg)
+- [remind](https://github.com/remind)
 - [GoodBoyCoder](https://github.com/GoodBoyCoder)
+- [PeppaO](https://github.com/PeppaO)
 - [funky-eyes](https://github.com/funky-eyes)
-- [dk2k](https://github.com/dk2k)
-- [MaoMaoandSnail](https://github.com/MaoMaoandSnail)
-- [yougecn](https://github.com/yougecn)
-- [arrrnold17](https://github.com/arrrnold17)
-- [xjlgod](https://github.com/xjlgod)
-- [PleaseGiveMeTheCoke](https://github.com/PleaseGiveMeTheCoke)
-- [dsomehan](https://github.com/dsomehan)
-- [psxjoy](https://github.com/psxjoy)
-- [xingfudeshi](https://github.com/xingfudeshi)
-- [o-jimin](https://github.com/o-jimin)
-- [lixingjia77](https://github.com/lixingjia77)
-
 
 
-Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.
+Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.