Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix: replace flatten-maven-plugin with easyj-maven-plugin to fix the conflict between shade and flatten #4626

Merged
merged 6 commits into from
May 31, 2022
Merged

bugfix: replace flatten-maven-plugin with easyj-maven-plugin to fix the conflict between shade and flatten #4626

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c54b81d
bugfix: fix the shade is not compatible with flatten
wangliang181230 May 22, 2022
a11c268
change version
wangliang181230 May 23, 2022
6622aca
使用easyj-maven-plugin插件，完全替代flatten-maven-plugin.
wangliang181230 May 30, 2022
03fa920
upgrade: easyj v0.5.3 -> v0.5.4
wangliang181230 May 30, 2022
4425880
modify 2.0.0.md
wangliang181230 May 30, 2022
748039f
upgrade
wangliang181230 May 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
29 changes: 24 additions & 5 deletions all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -620,6 +615,30 @@
</resource>
</resources>
<plugins>
<!-- Easyj -->
<plugin>
<groupId>icu.easyj.maven.plugins</groupId>
<artifactId>easyj-maven-plugin</artifactId>
<executions>
<!-- Use this goal to recreate the simplified pom.xml after the 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>
<!-- Shade -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
49 changes: 22 additions & 27 deletions build/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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.3</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>
Expand Down Expand Up @@ -165,6 +165,22 @@
<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>
<executions>
<execution>
<id>simplify-pom</id>
<goals>
<goal>simplify-pom</goal>
</goals>
</execution>
</executions>
<configuration>
<simplifiedPomFileName>.flattened-pom.xml</simplifiedPomFileName>
</configuration>
</plugin>
</plugins>
</pluginManagement>

Expand Down Expand Up @@ -224,7 +240,7 @@
<fileset>
<directory>./</directory>
<includes>
<include>*-pom*.xml</include>
<include>*-pom.xml</include>
<include>**/db_store/**</include>
<include>**/sessionStore/**</include>
<include>**/root.data</include>
Expand All @@ -234,31 +250,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>
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/io/seata/core/protocol/Version.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down