Commit beb385aab415925b83e8638b1ac4adcfbb615d9c
1 parent
36b3cfaf
修复 revision 在 Maven install、deploy 时，不替换为版本号的问题
Showing
4 changed files
with
79 additions
and
6 deletions
.gitignore
| @@ -8,6 +8,8 @@ | @@ -8,6 +8,8 @@ | ||
| 8 | target/ | 8 | target/ |
| 9 | !.mvn/wrapper/maven-wrapper.jar | 9 | !.mvn/wrapper/maven-wrapper.jar |
| 10 | 10 | ||
| 11 | +.flattened-pom.xml | ||
| 12 | + | ||
| 11 | ###################################################################### | 13 | ###################################################################### |
| 12 | # IDE | 14 | # IDE |
| 13 | 15 |
pom.xml
| @@ -30,7 +30,7 @@ | @@ -30,7 +30,7 @@ | ||
| 30 | <url>https://github.com/YunaiV/ruoyi-vue-pro</url> | 30 | <url>https://github.com/YunaiV/ruoyi-vue-pro</url> |
| 31 | 31 | ||
| 32 | <properties> | 32 | <properties> |
| 33 | - <revision>1.8.0-snapshot</revision> | 33 | + <revision>1.8.1-snapshot</revision> |
| 34 | <!-- Maven 相关 --> | 34 | <!-- Maven 相关 --> |
| 35 | <java.version>1.8</java.version> | 35 | <java.version>1.8</java.version> |
| 36 | <maven.compiler.source>${java.version}</maven.compiler.source> | 36 | <maven.compiler.source>${java.version}</maven.compiler.source> |
| @@ -94,6 +94,34 @@ | @@ -94,6 +94,34 @@ | ||
| 94 | </plugin> | 94 | </plugin> |
| 95 | </plugins> | 95 | </plugins> |
| 96 | </pluginManagement> | 96 | </pluginManagement> |
| 97 | + | ||
| 98 | + <plugins> | ||
| 99 | + <!-- 统一 revision 版本 --> | ||
| 100 | + <plugin> | ||
| 101 | + <groupId>org.codehaus.mojo</groupId> | ||
| 102 | + <artifactId>flatten-maven-plugin</artifactId> | ||
| 103 | + <configuration> | ||
| 104 | + <flattenMode>resolveCiFriendliesOnly</flattenMode> | ||
| 105 | + <updatePomFile>true</updatePomFile> | ||
| 106 | + </configuration> | ||
| 107 | + <executions> | ||
| 108 | + <execution> | ||
| 109 | + <goals> | ||
| 110 | + <goal>flatten</goal> | ||
| 111 | + </goals> | ||
| 112 | + <id>flatten</id> | ||
| 113 | + <phase>process-resources</phase> | ||
| 114 | + </execution> | ||
| 115 | + <execution> | ||
| 116 | + <goals> | ||
| 117 | + <goal>clean</goal> | ||
| 118 | + </goals> | ||
| 119 | + <id>flatten.clean</id> | ||
| 120 | + <phase>clean</phase> | ||
| 121 | + </execution> | ||
| 122 | + </executions> | ||
| 123 | + </plugin> | ||
| 124 | + </plugins> | ||
| 97 | </build> | 125 | </build> |
| 98 | 126 | ||
| 99 | <!-- 使用 huawei / aliyun 的 Maven 源，提升下载速度 --> | 127 | <!-- 使用 huawei / aliyun 的 Maven 源，提升下载速度 --> |
yudao-dependencies/pom.xml
| @@ -14,7 +14,8 @@ | @@ -14,7 +14,8 @@ | ||
| 14 | <url>https://github.com/YunaiV/ruoyi-vue-pro</url> | 14 | <url>https://github.com/YunaiV/ruoyi-vue-pro</url> |
| 15 | 15 | ||
| 16 | <properties> | 16 | <properties> |
| 17 | - <revision>1.8.0-snapshot</revision> | 17 | + <revision>1.8.1-snapshot</revision> |
| 18 | + <flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version> | ||
| 18 | <!-- 统一依赖管理 --> | 19 | <!-- 统一依赖管理 --> |
| 19 | <spring.boot.version>2.7.14</spring.boot.version> | 20 | <spring.boot.version>2.7.14</spring.boot.version> |
| 20 | <!-- Web 相关 --> | 21 | <!-- Web 相关 --> |
| @@ -645,4 +646,50 @@ | @@ -645,4 +646,50 @@ | ||
| 645 | </dependencies> | 646 | </dependencies> |
| 646 | </dependencyManagement> | 647 | </dependencyManagement> |
| 647 | 648 | ||
| 649 | + <build> | ||
| 650 | + <!-- 定义使用插件的版本 --> | ||
| 651 | + <pluginManagement> | ||
| 652 | + <plugins> | ||
| 653 | + <plugin> | ||
| 654 | + <groupId>org.codehaus.mojo</groupId> | ||
| 655 | + <artifactId>flatten-maven-plugin</artifactId> | ||
| 656 | + <version>${flatten-maven-plugin.version}</version> | ||
| 657 | + </plugin> | ||
| 658 | + <plugin> | ||
| 659 | + <groupId>org.springframework.boot</groupId> | ||
| 660 | + <artifactId>spring-boot-maven-plugin</artifactId> | ||
| 661 | + <version>${spring.boot.version}</version> | ||
| 662 | + </plugin> | ||
| 663 | + </plugins> | ||
| 664 | + </pluginManagement> | ||
| 665 | + | ||
| 666 | + <plugins> | ||
| 667 | + <!-- 统一 revision 版本 --> | ||
| 668 | + <plugin> | ||
| 669 | + <groupId>org.codehaus.mojo</groupId> | ||
| 670 | + <artifactId>flatten-maven-plugin</artifactId> | ||
| 671 | + <configuration> | ||
| 672 | + <flattenMode>resolveCiFriendliesOnly</flattenMode> | ||
| 673 | + <updatePomFile>true</updatePomFile> | ||
| 674 | + </configuration> | ||
| 675 | + <executions> | ||
| 676 | + <execution> | ||
| 677 | + <goals> | ||
| 678 | + <goal>flatten</goal> | ||
| 679 | + </goals> | ||
| 680 | + <id>flatten</id> | ||
| 681 | + <phase>process-resources</phase> | ||
| 682 | + </execution> | ||
| 683 | + <execution> | ||
| 684 | + <goals> | ||
| 685 | + <goal>clean</goal> | ||
| 686 | + </goals> | ||
| 687 | + <id>flatten.clean</id> | ||
| 688 | + <phase>clean</phase> | ||
| 689 | + </execution> | ||
| 690 | + </executions> | ||
| 691 | + </plugin> | ||
| 692 | + </plugins> | ||
| 693 | + </build> | ||
| 694 | + | ||
| 648 | </project> | 695 | </project> |
yudao-server/pom.xml
| @@ -111,10 +111,6 @@ | @@ -111,10 +111,6 @@ | ||
| 111 | <plugin> | 111 | <plugin> |
| 112 | <groupId>org.springframework.boot</groupId> | 112 | <groupId>org.springframework.boot</groupId> |
| 113 | <artifactId>spring-boot-maven-plugin</artifactId> | 113 | <artifactId>spring-boot-maven-plugin</artifactId> |
| 114 | - <version>2.7.14</version> <!-- 如果 spring.boot.version 版本修改，则这里也要跟着修改 --> | ||
| 115 | - <configuration> | ||
| 116 | - <fork>true</fork> | ||
| 117 | - </configuration> | ||
| 118 | <executions> | 114 | <executions> |
| 119 | <execution> | 115 | <execution> |
| 120 | <goals> | 116 | <goals> |