Commit fcca69d243cf7f2c726cad67ff4551697aaa3812
1 parent
beb385aa
修复 revision 在 Maven install、deploy 时,不替换为版本号的问题
Showing
3 changed files
with
8 additions
and
16 deletions
pom.xml
| @@ -37,6 +37,7 @@ | @@ -37,6 +37,7 @@ | ||
| 37 | <maven.compiler.target>${java.version}</maven.compiler.target> | 37 | <maven.compiler.target>${java.version}</maven.compiler.target> |
| 38 | <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version> | 38 | <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version> |
| 39 | <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version> | 39 | <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version> |
| 40 | + <flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version> | ||
| 40 | <!-- 看看咋放到 bom 里 --> | 41 | <!-- 看看咋放到 bom 里 --> |
| 41 | <lombok.version>1.18.28</lombok.version> | 42 | <lombok.version>1.18.28</lombok.version> |
| 42 | <spring.boot.version>2.7.14</spring.boot.version> | 43 | <spring.boot.version>2.7.14</spring.boot.version> |
| @@ -92,6 +93,10 @@ | @@ -92,6 +93,10 @@ | ||
| 92 | </annotationProcessorPaths> | 93 | </annotationProcessorPaths> |
| 93 | </configuration> | 94 | </configuration> |
| 94 | </plugin> | 95 | </plugin> |
| 96 | + <plugin> | ||
| 97 | + <groupId>org.codehaus.mojo</groupId> | ||
| 98 | + <artifactId>flatten-maven-plugin</artifactId> | ||
| 99 | + </plugin> | ||
| 95 | </plugins> | 100 | </plugins> |
| 96 | </pluginManagement> | 101 | </pluginManagement> |
| 97 | 102 | ||
| @@ -100,6 +105,7 @@ | @@ -100,6 +105,7 @@ | ||
| 100 | <plugin> | 105 | <plugin> |
| 101 | <groupId>org.codehaus.mojo</groupId> | 106 | <groupId>org.codehaus.mojo</groupId> |
| 102 | <artifactId>flatten-maven-plugin</artifactId> | 107 | <artifactId>flatten-maven-plugin</artifactId> |
| 108 | + <version>${flatten-maven-plugin.version}</version> | ||
| 103 | <configuration> | 109 | <configuration> |
| 104 | <flattenMode>resolveCiFriendliesOnly</flattenMode> | 110 | <flattenMode>resolveCiFriendliesOnly</flattenMode> |
| 105 | <updatePomFile>true</updatePomFile> | 111 | <updatePomFile>true</updatePomFile> |
yudao-dependencies/pom.xml
| @@ -647,27 +647,12 @@ | @@ -647,27 +647,12 @@ | ||
| 647 | </dependencyManagement> | 647 | </dependencyManagement> |
| 648 | 648 | ||
| 649 | <build> | 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> | 650 | <plugins> |
| 667 | <!-- 统一 revision 版本 --> | 651 | <!-- 统一 revision 版本 --> |
| 668 | <plugin> | 652 | <plugin> |
| 669 | <groupId>org.codehaus.mojo</groupId> | 653 | <groupId>org.codehaus.mojo</groupId> |
| 670 | <artifactId>flatten-maven-plugin</artifactId> | 654 | <artifactId>flatten-maven-plugin</artifactId> |
| 655 | + <version>${flatten-maven-plugin.version}</version> | ||
| 671 | <configuration> | 656 | <configuration> |
| 672 | <flattenMode>resolveCiFriendliesOnly</flattenMode> | 657 | <flattenMode>resolveCiFriendliesOnly</flattenMode> |
| 673 | <updatePomFile>true</updatePomFile> | 658 | <updatePomFile>true</updatePomFile> |
yudao-server/pom.xml
| @@ -111,6 +111,7 @@ | @@ -111,6 +111,7 @@ | ||
| 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>${spring.boot.version}</version> | ||
| 114 | <executions> | 115 | <executions> |
| 115 | <execution> | 116 | <execution> |
| 116 | <goals> | 117 | <goals> |