Skip to content

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

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

Jump to bottom
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

merged 6 commits into from
May 31, 2022

Conversation

@wangliang181230
Copy link
Contributor

@wangliang181230 wangliang181230 commented May 22, 2022 •
edited
Loading

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

问题修复：使用 easyj-maven-plugin 插件代替 flatten-maven-plugin 插件，以修复 shade 插件与 flatten 插件不兼容的问题，导致seata-all.pom 中的 ${revision} 并没有被替换为具体的版本号，导致应用端引用后打包失败。

另外，easyj-maven-plugin 插件还可以简化所有pom文件。

fixes #4618

easyj-maven-plugin 插件源码：https://github.com/easyj-projects/easyj-maven-plugin/tree/develop

@codecov-commenter
Copy link

codecov-commenter commented May 22, 2022 •
edited
Loading

Codecov Report

Merging #4626 (748039f) into develop (09832bd) will increase coverage by 0.13%.
The diff coverage is n/a.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #4626      +/-   ##
=============================================
+ Coverage      48.90%   49.04%   +0.13%     
- Complexity      4042     4056      +14     
=============================================
  Files            734      734              
  Lines          25577    25577              
  Branches        3156     3156              
=============================================
+ Hits           12509    12544      +35     
+ Misses         11732    11698      -34     
+ Partials        1336     1335       -1
Impacted Files Coverage Δ
.../src/main/java/io/seata/core/protocol/Version.java 8.33% <ø> (ø)
...o/seata/server/session/AbstractSessionManager.java 58.20% <0.00%> (-2.99%) ⬇️
...torage/file/store/FileTransactionStoreManager.java 56.77% <0.00%> (-2.91%) ⬇️
...rage/redis/store/RedisTransactionStoreManager.java 67.63% <0.00%> (+3.75%) ⬆️
...java/io/seata/server/storage/SessionConverter.java 89.09% <0.00%> (+9.09%) ⬆️
...va/io/seata/server/console/vo/GlobalSessionVO.java 55.88% <0.00%> (+33.82%) ⬆️

funky-eyes
funky-eyes approved these changes May 22, 2022
View reviewed changes
Copy link
Contributor

@funky-eyes funky-eyes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 要不要顺便把版本号改为1.5.2-SNAPSHOT ?

@funky-eyes funky-eyes added this to the 2.0.0 milestone May 22, 2022
@funky-eyes funky-eyes added the type: bug Category issues or prs related to bug. label May 22, 2022
@wangliang181230
Copy link
Contributor Author

LGTM 要不要顺便把版本号改为1.5.2-SNAPSHOT ?

done

@wangliang181230 wangliang181230 changed the title bugfix: fix the shade is not compatible with flatten bugfix: fix the shade is not compatible with flatten, reference new plugin May 30, 2022
slievrly
slievrly approved these changes May 30, 2022
View reviewed changes
Copy link
Member

@slievrly slievrly left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wangliang181230
Copy link
Contributor Author

等下，插件有个优化，我刚提交，等上传OSS后，我升下版本。

@wangliang181230 wangliang181230 mentioned this pull request May 30, 2022
Closed
1 task
@wangliang181230 wangliang181230 changed the title bugfix: fix the shade is not compatible with flatten, reference new plugin bugfix: fix the conflict between shade and flatten, replace flatten-maven-plugin with easyj-maven-plugin May 30, 2022
@wangliang181230 wangliang181230 changed the title bugfix: fix the conflict between shade and flatten, replace flatten-maven-plugin with easyj-maven-plugin bugfix: replace flatten-maven-plugin with easyj-maven-plugin to fix the conflict between shade and flatten May 31, 2022
@slievrly slievrly modified the milestones: 2.0.0, 1.5.2 May 31, 2022
@slievrly slievrly merged commit 959bd90 into apache:develop May 31, 2022
@wangliang181230 wangliang181230 deleted the fix-shade-flatten branch May 31, 2022 07:35
@wangliang181230
Copy link
Contributor Author

wangliang181230 commented Jun 7, 2022 •
edited
Loading

flatten-maven-plugin 插件社区，有人提了解决 flatten 和 shade 冲突的PR。
mojohaus/flatten-maven-plugin#281

liuqiufeng pushed a commit to liuqiufeng/seata that referenced this pull request Jun 11, 2022
@wangliang181230 @liuqiufeng
bugfix: replace flatten-maven-plugin with easyj-maven-plugin to f…
4b6c2f3 
…ix the conflict between `shade` and `flatten` (apache#4626)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@slievrly slievrly slievrly approved these changes

@funky-eyes funky-eyes funky-eyes approved these changes

Assignees

No one assigned

Labels

type: bug Category issues or prs related to bug.

Projects

None yet

Milestone

1.5.2

4 participants

@wangliang181230 @codecov-commenter @slievrly @funky-eyes