bugfix: replace flatten-maven-plugin with easyj-maven-plugin to f…

…ix the conflict between `shade` and `flatten` (#4626)
apache · May 31, 2022 · 959bd90 · 959bd90
1 parent 09832bd
commit 959bd90
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 57 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.1</seata.version>
 
 <dependency>
     <groupId>io.seata</groupId>

diff --git a/all/pom.xml b/all/pom.xml
@@ -30,11 +30,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>
@@ -673,6 +668,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/build/pom.xml b/build/pom.xml
@@ -63,7 +63,7 @@
 
     <properties>
         <!-- seata version -->
-        <revision>1.5.0</revision>
+        <revision>1.5.2-SNAPSHOT</revision>
 
         <!-- Compiler settings properties -->
         <java.version>1.8</java.version>
@@ -77,7 +77,7 @@
 
         <!-- 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>
@@ -165,6 +165,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>
 
@@ -224,7 +241,7 @@
                         <fileset>
                             <directory>./</directory>
                             <includes>
-                                <include>*-pom*.xml</include>
+                                <include>*-pom.xml</include>
                                 <include>**/db_store/**</include>
                                 <include>**/sessionStore/**</include>
                                 <include>**/root.data</include>
@@ -234,31 +251,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
@@ -6,7 +6,7 @@
 <details>
   <summary><mark>Release notes</mark></summary>
 
-  ### Seata 2.0.0
+### Seata 2.0.0
 
 Seata 2.0.0 发布。
 
@@ -15,30 +15,34 @@ Seata 是一款开源的分布式事务解决方案，提供高性能和简单
 此版本更新如下：
 
 ### feature：
-* [[#1234](https://github.com/seata/seata/pull/1234)] 样例，后续请删除
+  - [[#1234](https://github.com/seata/seata/pull/1234)] 样例，后续请删除
 
 ### bugfix：
-* [[#1234](https://github.com/seata/seata/pull/1234)] 样例，后续请删除
+  - [[#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支持
+  - [[#4567](https://github.com/seata/seata/pull/4567)] 支持where条件带函数find_in_set支持
 
 ### test：
-* [[#1234](https://github.com/seata/seata/pull/1234)] 样例，后续请删除
+  - [[#1234](https://github.com/seata/seata/pull/1234)] 样例，后续请删除
 
 
- 非常感谢以下 contributors 的代码贡献。若有无意遗漏，请报告。
+### Contributors:
 
-   - [slievrly](https://github.com/slievrly)
-   - [doubleDimple](https://github.com/doubleDimple)
+非常感谢以下 contributors 的代码贡献。若有无意遗漏，请报告。
+
+  - [slievrly](https://github.com/slievrly)
+  - [doubleDimple](https://github.com/doubleDimple)
 
 同时，我们收到了社区反馈的很多有价值的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
+#### 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>
+</details>
diff --git a/changes/en-us/2.0.0.md b/changes/en-us/2.0.0.md
@@ -1,11 +1,12 @@
-### 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
 
 Seata 2.0.0 Released.
 
@@ -14,16 +15,20 @@ Seata is an easy-to-use, high-performance, open source distributed transaction s
 The version is updated as follows:
 
 ### feature：
-  * [[#1234](https://github.com/seata/seata/pull/1234)] Please delete the sample later
+  - [[#1234](https://github.com/seata/seata/pull/1234)] Please delete the sample later
 
 ### bugfix：
-  * [[#1234](https://github.com/seata/seata/pull/1234)] Please delete the sample later
+  - [[#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)
+  - [[#4567](https://github.com/seata/seata/pull/4567)] Support where method condition(find_in_set)
 
 ### test:
-  * [[#1234](https://github.com/seata/seata/pull/1234)] Please delete the sample later
+  - [[#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.
 
@@ -32,12 +37,12 @@ Thanks to these contributors for their code commits. Please report an unintended
 
 Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.
 
- #### Link	
+
+#### 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/core/src/main/java/io/seata/core/protocol/Version.java b/core/src/main/java/io/seata/core/protocol/Version.java
@@ -36,7 +36,7 @@ public class Version {
     /**
      * The constant CURRENT.
      */
-    private static final String CURRENT = "1.5.0";
+    private static final String CURRENT = "1.5.2-SNAPSHOT";
     private static final String VERSION_0_7_1 = "0.7.1";
     private static final String VERSION_1_5_0 = "1.5.0";
     private static final int MAX_VERSION_DOT = 3;