diff --git a/.gitignore b/.gitignore index 9e339689d..fa3ee9749 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ nbdist/ !*/build/*.java !*/build/*.html !*/build/*.xml + +.flattened-pom.xml diff --git a/pom.xml b/pom.xml index 5efd58c9a..3f7ef30ae 100644 --- a/pom.xml +++ b/pom.xml @@ -6,19 +6,18 @@ com.ruoyi ruoyi-vue-plus - 4.5.0 + ${revision} RuoYi-Vue-Plus https://gitee.com/JavaLionLi/RuoYi-Vue-Plus RuoYi-Vue-Plus后台管理系统 - 4.5.0 + 4.5.0 2.7.7 UTF-8 UTF-8 1.8 - 3.2.2 2.2.2 1.6.14 5.2.3 @@ -45,6 +44,13 @@ 2.0.23 3.1.660 + + + 3.2.2 + 3.2.2 + 3.10.1 + 2.22.2 + 1.3.0 @@ -268,56 +274,56 @@ com.ruoyi ruoyi-job - ${ruoyi-vue-plus.version} + ${revision} com.ruoyi ruoyi-generator - ${ruoyi-vue-plus.version} + ${revision} com.ruoyi ruoyi-framework - ${ruoyi-vue-plus.version} + ${revision} com.ruoyi ruoyi-system - ${ruoyi-vue-plus.version} + ${revision} com.ruoyi ruoyi-common - ${ruoyi-vue-plus.version} + ${revision} com.ruoyi ruoyi-oss - ${ruoyi-vue-plus.version} + ${revision} com.ruoyi ruoyi-sms - ${ruoyi-vue-plus.version} + ${revision} com.ruoyi ruoyi-demo - ${ruoyi-vue-plus.version} + ${revision} @@ -342,7 +348,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.9.0 + ${maven-compiler-plugin.verison} ${java.version} ${java.version} @@ -370,7 +376,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.2 + ${maven-surefire-plugin.version} -Dfile.encoding=UTF-8 @@ -379,6 +385,32 @@ exclude + + + org.codehaus.mojo + flatten-maven-plugin + ${flatten-maven-plugin.version} + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 91baa5cfa..ced8343bd 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -5,7 +5,8 @@ ruoyi-vue-plus com.ruoyi - 4.5.0 + ${revision} + ../pom.xml 4.0.0 jar @@ -119,7 +120,7 @@ org.apache.maven.plugins maven-war-plugin - 3.2.2 + ${maven-war-plugin.version} false ${project.artifactId} diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index dfeead2a2..6cf413270 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -5,7 +5,8 @@ ruoyi-vue-plus com.ruoyi - 4.5.0 + ${revision} + ../pom.xml 4.0.0 diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml index 31f712cbc..869241b94 100644 --- a/ruoyi-demo/pom.xml +++ b/ruoyi-demo/pom.xml @@ -5,7 +5,8 @@ ruoyi-vue-plus com.ruoyi - 4.5.0 + ${revision} + ../pom.xml 4.0.0 diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml index a55645806..f4c15eff0 100644 --- a/ruoyi-extend/pom.xml +++ b/ruoyi-extend/pom.xml @@ -5,7 +5,8 @@ ruoyi-vue-plus com.ruoyi - 4.5.0 + ${revision} + ../pom.xml 4.0.0 ruoyi-extend diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml index 19fc04e20..c68d74014 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml +++ b/ruoyi-extend/ruoyi-monitor-admin/pom.xml @@ -5,7 +5,8 @@ ruoyi-extend com.ruoyi - 4.5.0 + ${revision} + ../pom.xml 4.0.0 jar diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml index 7e65df583..aadbe8208 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml +++ b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml @@ -4,7 +4,8 @@ ruoyi-extend com.ruoyi - 4.5.0 + ${revision} + ../pom.xml ruoyi-xxl-job-admin jar diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index 072b5b2f2..21b65b7dc 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -5,7 +5,8 @@ ruoyi-vue-plus com.ruoyi - 4.5.0 + ${revision} + ../pom.xml 4.0.0 diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml index 529048eed..6318c88a1 100644 --- a/ruoyi-generator/pom.xml +++ b/ruoyi-generator/pom.xml @@ -5,7 +5,8 @@ ruoyi-vue-plus com.ruoyi - 4.5.0 + ${revision} + ../pom.xml 4.0.0 diff --git a/ruoyi-job/pom.xml b/ruoyi-job/pom.xml index 1146c9254..7283bf013 100644 --- a/ruoyi-job/pom.xml +++ b/ruoyi-job/pom.xml @@ -5,7 +5,8 @@ ruoyi-vue-plus com.ruoyi - 4.5.0 + ${revision} + ../pom.xml 4.0.0 jar diff --git a/ruoyi-oss/pom.xml b/ruoyi-oss/pom.xml index d25f2b8df..4ff84b620 100644 --- a/ruoyi-oss/pom.xml +++ b/ruoyi-oss/pom.xml @@ -5,7 +5,8 @@ ruoyi-vue-plus com.ruoyi - 4.5.0 + ${revision} + ../pom.xml 4.0.0 diff --git a/ruoyi-sms/pom.xml b/ruoyi-sms/pom.xml index 7180b058a..66e5fb7ec 100644 --- a/ruoyi-sms/pom.xml +++ b/ruoyi-sms/pom.xml @@ -5,7 +5,8 @@ ruoyi-vue-plus com.ruoyi - 4.5.0 + ${revision} + ../pom.xml 4.0.0 diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml index c1c28d9f8..3e9e680d3 100644 --- a/ruoyi-system/pom.xml +++ b/ruoyi-system/pom.xml @@ -5,7 +5,8 @@ ruoyi-vue-plus com.ruoyi - 4.5.0 + ${revision} + ../pom.xml 4.0.0