Merge pull request #4771 from seata/1.5.2

release: release for 1.5.2
apache · Jul 12, 2022 · c95d49f · c95d49f
2 parents ede95ef + 46d75f3
commit c95d49f
Show file tree

Hide file tree

Showing 147 changed files with 1,305 additions and 381 deletions.
diff --git a/README.md b/README.md
@@ -82,7 +82,7 @@ For more details about principle and design, please go to [Seata wiki page](http
 
 ## Maven dependency
 ```xml
-<seata.version>1.5.0</seata.version>
+<seata.version>1.5.2</seata.version>
 
 <dependency>
     <groupId>io.seata</groupId>

diff --git a/all/pom.xml b/all/pom.xml
@@ -29,11 +29,6 @@
     <name>Seata All-in-one ${project.version}</name>
     <description>Seata is an easy-to-use, high-performance, java based, open source distributed transaction solution.</description>
 
-    <properties>
-        <!-- seata version -->
-        <revision>1.5.0</revision>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -672,6 +667,30 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- Easyj -->
+            <plugin>
+                <groupId>icu.easyj.maven.plugins</groupId>
+                <artifactId>easyj-maven-plugin</artifactId>
+                <executions>
+                    <!-- Use this goal to recreate the '.flattened-pom.xml' after shade. -->
+                    <execution>
+                        <id>create-pom-file</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>create-pom-file</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <!-- the config of the 'simplify-pom' plugin -->
+                <configuration>
+                    <keepProvidedDependencies>true</keepProvidedDependencies>
+                    <keepOptionalDependencies>true</keepOptionalDependencies>
+                    <excludeDependencies>
+                        <!-- Exclude dependencies that need to be shaded. -->
+                        <dependency>io.seata:*</dependency>
+                    </excludeDependencies>
+                </configuration>
+            </plugin>
             <!-- Dependency -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -26,7 +26,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>seata-bom</artifactId>
-
     <packaging>pom</packaging>
 
     <name>Seata bom ${project.version}</name>

diff --git a/build/pom.xml b/build/pom.xml
@@ -25,8 +25,7 @@
     <version>${revision}</version>
 
     <name>Seata Build ${project.version}</name>
-    <description>Seata Build Pom</description>
-
+    <description>plugin management for Seata built with Maven</description>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
@@ -64,7 +63,7 @@
 
     <properties>
         <!-- seata version -->
-        <revision>1.5.0</revision>
+        <revision>1.5.2</revision>
 
         <!-- Compiler settings properties -->
         <java.version>1.8</java.version>
@@ -75,10 +74,11 @@
 
         <!-- The version of spring-boot for 'spring-boot-dependencies' and 'spring-boot-maven-plugin' -->
         <spring-boot.version>2.4.13</spring-boot.version>
+        <spring-framework.version>5.3.18</spring-framework.version>
 
         <!-- Maven plugin versions -->
         <!-- Build -->
-        <flatten-maven-plugin.version>1.1.0</flatten-maven-plugin.version>
+        <easyj-maven-plugin.version>0.5.6</easyj-maven-plugin.version>
         <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
         <!-- Compiler -->
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
@@ -166,6 +166,23 @@
                     <artifactId>license-maven-plugin</artifactId>
                     <version>${mojo-license-maven-plugin.version}</version>
                 </plugin>
+                <plugin>
+                    <groupId>icu.easyj.maven.plugins</groupId>
+                    <artifactId>easyj-maven-plugin</artifactId>
+                    <version>${easyj-maven-plugin.version}</version>
+                    <!-- This goal can replace flatten-maven-plugin to flatten the pom, and replace '${revision}' to the actual version. -->
+                    <executions>
+                        <execution>
+                            <id>simplify-pom</id>
+                            <goals>
+                                <goal>simplify-pom</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <simplifiedPomFileName>.flattened-pom.xml</simplifiedPomFileName>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
 
@@ -225,7 +242,7 @@
                         <fileset>
                             <directory>./</directory>
                             <includes>
-                                <include>*-pom*.xml</include>
+                                <include>*-pom.xml</include>
                                 <include>**/db_store/**</include>
                                 <include>**/sessionStore/**</include>
                                 <include>**/root.data</include>
@@ -235,31 +252,10 @@
                     </filesets>
                 </configuration>
             </plugin>
-            <!-- Flatten -->
+            <!-- EasyJ -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>flatten-maven-plugin</artifactId>
-                <version>${flatten-maven-plugin.version}</version>
-                <configuration>
-                    <updatePomFile>true</updatePomFile>
-                    <flattenMode>resolveCiFriendliesOnly</flattenMode>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>flatten</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>flatten</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>flatten.clean</id>
-                        <phase>clean</phase>
-                        <goals>
-                            <goal>clean</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <groupId>icu.easyj.maven.plugins</groupId>
+                <artifactId>easyj-maven-plugin</artifactId>
             </plugin>
             <!-- Enforcer -->
             <plugin>

diff --git a/changes/2.0.0.md b/changes/2.0.0.md
diff --git a/changes/en-us/2.0.0.md b/changes/en-us/2.0.0.md
@@ -1,46 +1,51 @@
-### 2.0.0	
+### 2.0.0
 
  [source](https://github.com/seata/seata/archive/v2.0.0.zip) |	
  [binary](https://github.com/seata/seata/releases/download/v2.0.0/seata-server-2.0.0.zip) 	
 
-<details>	
+<details>
   <summary><mark>Release notes</mark></summary>	
-  ### Seata 2.0.0	
 
-  Seata 2.0.0 Released.
+### Seata 2.0.0
 
-  Seata is an easy-to-use, high-performance, open source distributed transaction solution.
+Seata 2.0.0 Released.
 
-  The version is updated as follows:
+Seata is an easy-to-use, high-performance, open source distributed transaction solution.
 
+The version is updated as follows:
 
-  ### feature：
+### feature：
   - [[#1234](https://github.com/seata/seata/pull/1234)] Please delete the sample later
 
-  ### bugfix：
+### bugfix：
   - [[#1234](https://github.com/seata/seata/pull/1234)] Please delete the sample later
+  - [[#4626](https://github.com/seata/seata/pull/4626)] Replace `flatten-maven-plugin` with `easyj-maven-plugin` to fix the conflict between `shade` and `flatten`
 
+### optimize：
+  - [[#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
 
-   ### optimize：
-  - [[#1234](https://github.com/seata/seata/pull/1234)] Please delete the sample later
 
+### test:
+  - [[#1234](https://github.com/seata/seata/pull/1234)] Please delete the sample later
 
-  ### test:	
 
-* [[#1234](https://github.com/seata/seata/pull/1234)] Please delete the sample later
+### Contributors:
 
 Thanks to these contributors for their code commits. Please report an unintended omission.
 
-- [slievrly](https://github.com/slievrly) 
+  - [slievrly](https://github.com/slievrly)
+  - [doubleDimple](https://github.com/doubleDimple)
+  - [Bughue](https://github.com/Bughue)
 
 Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.
 
- #### Link	
 
- - **Seata:** https://github.com/seata/seata
- - **Seata-Samples:** https://github.com/seata/seata-samples
- - **Release:** https://github.com/seata/seata/releases
- - **WebSite:** https://seata.io
+#### Link
 
+  - **Seata:** https://github.com/seata/seata
+  - **Seata-Samples:** https://github.com/seata/seata-samples
+  - **Release:** https://github.com/seata/seata/releases
+  - **WebSite:** https://seata.io
 
 </details>
diff --git a/changes/en-us/develop.md b/changes/en-us/develop.md
@@ -0,0 +1,66 @@
+Add changes here for all PR submitted to the develop branch.
+
+
+<!-- Please add the `changes` to the following location(feature/bugfix/optimize/test) based on the type of PR -->
+
+### feature：
+  - [[#4661](https://github.com/seata/seata/pull/4713)] support xid load balance
+  - [[#4676](https://github.com/seata/seata/pull/4676)] support server to expose Nacos services by mounting SLB
+  - [[#4642](https://github.com/seata/seata/pull/4642)] support batch message parallel processing
+  - [[#4567](https://github.com/seata/seata/pull/4567)] support where method condition(find_in_set)
+
+
+### bugfix：
+  - [[#4515](https://github.com/seata/seata/pull/4515)] fix the error of SeataTCCFenceAutoConfiguration when database unused
+  - [[#4661](https://github.com/seata/seata/pull/4661)] fix sql exception with PostgreSQL in module console
+  - [[#4667](https://github.com/seata/seata/pull/4682)] fix the exception in RedisTransactionStoreManager for update map During iteration
+  - [[#4678](https://github.com/seata/seata/pull/4678)] fix the error of key transport.enableRmClientBatchSendRequest cache penetration if not configure
+  - [[#4701](https://github.com/seata/seata/pull/4701)] fix missing command line args
+  - [[#4607](https://github.com/seata/seata/pull/4607)] fix bug on skipping lock check
+  - [[#4696](https://github.com/seata/seata/pull/4696)] fix oracle database insert value
+  - [[#4726](https://github.com/seata/seata/pull/4726)] fix batch message send may return NullPointException
+  - [[#4729](https://github.com/seata/seata/pull/4729)] fix set AspectTransactional.rollbackForClassName with wrong value
+  - [[#4653](https://github.com/seata/seata/pull/4653)] fix the sql exception when pk is non-numeric in INSERT_ON_DUPLICATE SQL
+
+### optimize：
+  - [[#4650](https://github.com/seata/seata/pull/4650)] fix some security vulnerabilities
+  - [[#4670](https://github.com/seata/seata/pull/4670)] optimize the thread pool size of branchResultMessageExecutor
+  - [[#4662](https://github.com/seata/seata/pull/4662)] optimize rollback transaction metrics
+  - [[#4693](https://github.com/seata/seata/pull/4693)] optimize the console navigation bar
+  - [[#4700](https://github.com/seata/seata/pull/4700)] fix maven-compiler-plugin and maven-resources-plugin execute failed
+  - [[#4711](https://github.com/seata/seata/pull/4711)] separate lib dependencies for deployments
+  - [[#4720](https://github.com/seata/seata/pull/4720)] optimize pom description
+  - [[#4728](https://github.com/seata/seata/pull/4728)] upgrade logback dependency to 1.2.9
+  - [[#4745](https://github.com/seata/seata/pull/4745)] support mysql8 in release package
+  - [[#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
+
+### test:
+
+  - [[#4544](https://github.com/seata/seata/pull/4544)] optimize jackson dependencies in TransactionContextFilterTest
+  - [[#4731](https://github.com/seata/seata/pull/4731)] fix UT failed in AsyncWorkerTest and LockManagerTest
+
+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)
+- [pengten](https://github.com/pengten)
+- [YSF-A](https://github.com/YSF-A)
+- [tuwenlin](https://github.com/tuwenlin)
+- [Ifdevil](https://github.com/Ifdevil)
+- [wingchi-leung](https://github.com/wingchi-leung)
+- [liurong](https://github.com/robynron)
+- [opelok-z](https://github.com/opelok-z)
+- [a364176773](https://github.com/a364176773)
+- [2129zxl](https://github.com/2129zxl)
+- [Smery-lxm](https://github.com/Smery-lxm)
+- [doubleDimple](https://github.com/doubleDimple)
+- [wangliang181230](https://github.com/wangliang181230)
+- [Bughue](https://github.com/Bughue)
+- [AYue-94](https://github.com/AYue-94)
+- [lingxiao-wu](https://github.com/lingxiao-wu)
+- [caohdgege](https://github.com/caohdgege)
+
+
+Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.
diff --git a/changes/1.4.2.md → changes/zh-cn/1.4.2.md b/changes/1.4.2.md → changes/zh-cn/1.4.2.md
diff --git a/changes/1.5.0.md → changes/zh-cn/1.5.0.md b/changes/1.5.0.md → changes/zh-cn/1.5.0.md
diff --git a/changes/zh-cn/2.0.0.md b/changes/zh-cn/2.0.0.md
@@ -0,0 +1,50 @@
+### 2.0.0
+
+ [source](https://github.com/seata/seata/archive/v2.0.0.zip) |
+ [binary](https://github.com/seata/seata/releases/download/v2.0.0/seata-server-2.0.0.zip) 
+
+<details>
+  <summary><mark>Release notes</mark></summary>
+
+### Seata 2.0.0
+
+Seata 2.0.0 发布。
+
+Seata 是一款开源的分布式事务解决方案，提供高性能和简单易用的分布式事务服务。
+
+此版本更新如下：
+
+### feature：
+  - [[#1234](https://github.com/seata/seata/pull/1234)] 样例，后续请删除
+
+### bugfix：
+  - [[#1234](https://github.com/seata/seata/pull/1234)] 样例，后续请删除
+  - [[#4626](https://github.com/seata/seata/pull/4626)] 使用 `easyj-maven-plugin` 插件代替 `flatten-maven-plugin` 插件，以修复 `shade` 插件与 `flatten` 插件不兼容的问题，导致`seata-all.pom` 中的 `${revision}` 并没有被替换，使应用端引用 `seata-all` 后无法打包。
+
+### optimize：
+  - [[#4567](https://github.com/seata/seata/pull/4567)] 支持where条件带函数find_in_set支持
+  - [[#4629](https://github.com/seata/seata/pull/4629)] 更新globalsession状态时检查更改前后的对应关系正确性
+
+### test：
+  - [[#1234](https://github.com/seata/seata/pull/1234)] 样例，后续请删除
+
+
+### Contributors:
+
+非常感谢以下 contributors 的代码贡献。若有无意遗漏，请报告。
+
+  - [slievrly](https://github.com/slievrly)
+  - [doubleDimple](https://github.com/doubleDimple)
+  - [Bughue](https://github.com/Bughue)
+
+同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
+
+
+#### Link
+
+  - **Seata:** https://github.com/seata/seata  
+  - **Seata-Samples:** https://github.com/seata/seata-samples   
+  - **Release:** https://github.com/seata/seata/releases
+  - **WebSite:** https://seata.io
+
+</details>