From f3c6513d5ae0d5dc8f4bf2c8625d7edb85b7521d Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期五, 13 一月 2023 18:43:40 +0800 Subject: [PATCH] add 新增 flatten-maven-plugin 插件统一版本号管理 --- ruoyi-extend/ruoyi-monitor-admin/pom.xml | 3 + ruoyi-extend/ruoyi-xxl-job-admin/pom.xml | 3 + .gitignore | 2 + ruoyi-framework/pom.xml | 3 + ruoyi-admin/pom.xml | 5 +- ruoyi-system/pom.xml | 3 + ruoyi-generator/pom.xml | 3 + pom.xml | 58 ++++++++++++++++++++++------ ruoyi-common/pom.xml | 3 + ruoyi-extend/pom.xml | 3 + ruoyi-demo/pom.xml | 3 + ruoyi-oss/pom.xml | 3 + ruoyi-job/pom.xml | 3 + ruoyi-sms/pom.xml | 3 + 14 files changed, 72 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 9e33968..fa3ee97 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ !*/build/*.java !*/build/*.html !*/build/*.xml + +.flattened-pom.xml diff --git a/pom.xml b/pom.xml index 5efd58c..3f7ef30 100644 --- a/pom.xml +++ b/pom.xml @@ -6,19 +6,18 @@ <groupId>com.ruoyi</groupId> <artifactId>ruoyi-vue-plus</artifactId> - <version>4.5.0</version> + <version>${revision}</version> <name>RuoYi-Vue-Plus</name> <url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url> <description>RuoYi-Vue-Plus鍚庡彴绠$悊绯荤粺</description> <properties> - <ruoyi-vue-plus.version>4.5.0</ruoyi-vue-plus.version> + <revision>4.5.0</revision> <spring-boot.version>2.7.7</spring-boot.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <java.version>1.8</java.version> - <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version> <spring-boot.mybatis>2.2.2</spring-boot.mybatis> <springdoc.version>1.6.14</springdoc.version> <poi.version>5.2.3</poi.version> @@ -45,6 +44,13 @@ <!-- SMS 閰嶇疆 --> <aliyun.sms.version>2.0.23</aliyun.sms.version> <tencent.sms.version>3.1.660</tencent.sms.version> + + <!-- 鎻掍欢鐗堟湰 --> + <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version> + <maven-war-plugin.version>3.2.2</maven-war-plugin.version> + <maven-compiler-plugin.verison>3.10.1</maven-compiler-plugin.verison> + <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version> + <flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version> </properties> <profiles> @@ -268,56 +274,56 @@ <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-job</artifactId> - <version>${ruoyi-vue-plus.version}</version> + <version>${revision}</version> </dependency> <!-- 浠g爜鐢熸垚--> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-generator</artifactId> - <version>${ruoyi-vue-plus.version}</version> + <version>${revision}</version> </dependency> <!-- 鏍稿績妯″潡--> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-framework</artifactId> - <version>${ruoyi-vue-plus.version}</version> + <version>${revision}</version> </dependency> <!-- 绯荤粺妯″潡--> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-system</artifactId> - <version>${ruoyi-vue-plus.version}</version> + <version>${revision}</version> </dependency> <!-- 閫氱敤宸ュ叿--> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common</artifactId> - <version>${ruoyi-vue-plus.version}</version> + <version>${revision}</version> </dependency> <!-- OSS瀵硅薄瀛樺偍妯″潡 --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-oss</artifactId> - <version>${ruoyi-vue-plus.version}</version> + <version>${revision}</version> </dependency> <!-- SMS鐭俊妯″潡 --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-sms</artifactId> - <version>${ruoyi-vue-plus.version}</version> + <version>${revision}</version> </dependency> <!-- demo妯″潡 --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-demo</artifactId> - <version>${ruoyi-vue-plus.version}</version> + <version>${revision}</version> </dependency> </dependencies> @@ -342,7 +348,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.9.0</version> + <version>${maven-compiler-plugin.verison}</version> <configuration> <source>${java.version}</source> <target>${java.version}</target> @@ -370,7 +376,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.22.2</version> + <version>${maven-surefire-plugin.version}</version> <configuration> <argLine>-Dfile.encoding=UTF-8</argLine> <!-- 鏍规嵁鎵撳寘鐜鎵ц瀵瑰簲鐨凘Tag娴嬭瘯鏂规硶 --> @@ -379,6 +385,32 @@ <excludedGroups>exclude</excludedGroups> </configuration> </plugin> + <!-- 缁熶竴鐗堟湰鍙风鐞� --> + <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> + </plugin> </plugins> <resources> <resource> diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 91baa5c..ced8343 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -5,7 +5,8 @@ <parent> <artifactId>ruoyi-vue-plus</artifactId> <groupId>com.ruoyi</groupId> - <version>4.5.0</version> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> @@ -119,7 +120,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>3.2.2</version> + <version>${maven-war-plugin.version}</version> <configuration> <failOnMissingWebXml>false</failOnMissingWebXml> <warName>${project.artifactId}</warName> diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index dfeead2..6cf4132 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -5,7 +5,8 @@ <parent> <artifactId>ruoyi-vue-plus</artifactId> <groupId>com.ruoyi</groupId> - <version>4.5.0</version> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml index 31f712c..869241b 100644 --- a/ruoyi-demo/pom.xml +++ b/ruoyi-demo/pom.xml @@ -5,7 +5,8 @@ <parent> <artifactId>ruoyi-vue-plus</artifactId> <groupId>com.ruoyi</groupId> - <version>4.5.0</version> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml index a556458..f4c15ef 100644 --- a/ruoyi-extend/pom.xml +++ b/ruoyi-extend/pom.xml @@ -5,7 +5,8 @@ <parent> <artifactId>ruoyi-vue-plus</artifactId> <groupId>com.ruoyi</groupId> - <version>4.5.0</version> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ruoyi-extend</artifactId> diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml index 19fc04e..c68d740 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml +++ b/ruoyi-extend/ruoyi-monitor-admin/pom.xml @@ -5,7 +5,8 @@ <parent> <artifactId>ruoyi-extend</artifactId> <groupId>com.ruoyi</groupId> - <version>4.5.0</version> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml index 7e65df5..aadbe82 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml +++ b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml @@ -4,7 +4,8 @@ <parent> <artifactId>ruoyi-extend</artifactId> <groupId>com.ruoyi</groupId> - <version>4.5.0</version> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>ruoyi-xxl-job-admin</artifactId> <packaging>jar</packaging> diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index 072b5b2..21b65b7 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -5,7 +5,8 @@ <parent> <artifactId>ruoyi-vue-plus</artifactId> <groupId>com.ruoyi</groupId> - <version>4.5.0</version> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml index 529048e..6318c88 100644 --- a/ruoyi-generator/pom.xml +++ b/ruoyi-generator/pom.xml @@ -5,7 +5,8 @@ <parent> <artifactId>ruoyi-vue-plus</artifactId> <groupId>com.ruoyi</groupId> - <version>4.5.0</version> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/ruoyi-job/pom.xml b/ruoyi-job/pom.xml index 1146c92..7283bf0 100644 --- a/ruoyi-job/pom.xml +++ b/ruoyi-job/pom.xml @@ -5,7 +5,8 @@ <parent> <artifactId>ruoyi-vue-plus</artifactId> <groupId>com.ruoyi</groupId> - <version>4.5.0</version> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> diff --git a/ruoyi-oss/pom.xml b/ruoyi-oss/pom.xml index d25f2b8..4ff84b6 100644 --- a/ruoyi-oss/pom.xml +++ b/ruoyi-oss/pom.xml @@ -5,7 +5,8 @@ <parent> <artifactId>ruoyi-vue-plus</artifactId> <groupId>com.ruoyi</groupId> - <version>4.5.0</version> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/ruoyi-sms/pom.xml b/ruoyi-sms/pom.xml index 7180b05..66e5fb7 100644 --- a/ruoyi-sms/pom.xml +++ b/ruoyi-sms/pom.xml @@ -5,7 +5,8 @@ <parent> <artifactId>ruoyi-vue-plus</artifactId> <groupId>com.ruoyi</groupId> - <version>4.5.0</version> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml index c1c28d9..3e9e680 100644 --- a/ruoyi-system/pom.xml +++ b/ruoyi-system/pom.xml @@ -5,7 +5,8 @@ <parent> <artifactId>ruoyi-vue-plus</artifactId> <groupId>com.ruoyi</groupId> - <version>4.5.0</version> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> -- Gitblit v1.9.3