diff --git a/.gitignore b/.gitignore index 877ad0ba6..a3e921c8a 100755 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ target/ Thumbs.db Servers .metadata +.flattened-pom.xml diff --git a/pig-auth/pom.xml b/pig-auth/pom.xml index 311ec54d1..9f4c1b227 100755 --- a/pig-auth/pom.xml +++ b/pig-auth/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 3.7.3 + ${revision} pig-auth diff --git a/pig-common/pig-common-bom/pom.xml b/pig-common/pig-common-bom/pom.xml index 68e2cce14..0ded24e05 100644 --- a/pig-common/pig-common-bom/pom.xml +++ b/pig-common/pig-common-bom/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pig-common-bom - 3.7.3 + ${revision} pom pig-common-bom @@ -14,13 +14,13 @@ pig cloud parent - ${project.version} + + 3.7.4 3.2.2 UTF-8 17 17 4.9.9 - 0.0.39 1.2.83 3.0.3 2.1.0 @@ -36,6 +36,8 @@ 5.4.1 5.8.23 1.8.4 + 0.0.39 + 1.6.0 @@ -44,52 +46,52 @@ com.pig4cloud pig-common-core - ${pig.common.version} + ${revision} com.pig4cloud pig-common-datasource - ${pig.common.version} + ${revision} com.pig4cloud pig-common-log - ${pig.common.version} + ${revision} com.pig4cloud pig-common-mybatis - ${pig.common.version} + ${revision} com.pig4cloud pig-common-oss - ${pig.common.version} + ${revision} com.pig4cloud pig-common-security - ${pig.common.version} + ${revision} com.pig4cloud pig-common-feign - ${pig.common.version} + ${revision} com.pig4cloud pig-common-swagger - ${pig.common.version} + ${revision} com.pig4cloud pig-common-xss - ${pig.common.version} + ${revision} com.pig4cloud pig-upms-api - ${pig.common.version} + ${revision} com.mysql @@ -200,6 +202,32 @@ spring-javaformat-maven-plugin ${spring.checkstyle.plugin} + + + org.codehaus.mojo + flatten-maven-plugin + ${flatten-maven-plugin.version} + + resolveCiFriendliesOnly + true + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + diff --git a/pig-common/pig-common-core/pom.xml b/pig-common/pig-common-core/pom.xml index f09b4759e..296f27030 100755 --- a/pig-common/pig-common-core/pom.xml +++ b/pig-common/pig-common-core/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 3.7.3 + ${revision} pig-common-core diff --git a/pig-common/pig-common-datasource/pom.xml b/pig-common/pig-common-datasource/pom.xml index 4cfbb4c39..c529eeeb5 100644 --- a/pig-common/pig-common-datasource/pom.xml +++ b/pig-common/pig-common-datasource/pom.xml @@ -21,7 +21,7 @@ pig-common com.pig4cloud - 3.7.3 + ${revision} 4.0.0 diff --git a/pig-common/pig-common-feign/pom.xml b/pig-common/pig-common-feign/pom.xml index 6ce9eb1c5..2ca8f0e00 100755 --- a/pig-common/pig-common-feign/pom.xml +++ b/pig-common/pig-common-feign/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 3.7.3 + ${revision} 4.0.0 diff --git a/pig-common/pig-common-log/pom.xml b/pig-common/pig-common-log/pom.xml index 6f048e093..8a94a9aac 100755 --- a/pig-common/pig-common-log/pom.xml +++ b/pig-common/pig-common-log/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 3.7.3 + ${revision} pig-common-log diff --git a/pig-common/pig-common-mybatis/pom.xml b/pig-common/pig-common-mybatis/pom.xml index d5a705de5..c793197fa 100755 --- a/pig-common/pig-common-mybatis/pom.xml +++ b/pig-common/pig-common-mybatis/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 3.7.3 + ${revision} pig-common-mybatis diff --git a/pig-common/pig-common-oss/pom.xml b/pig-common/pig-common-oss/pom.xml index 97ed05026..42f60a11a 100755 --- a/pig-common/pig-common-oss/pom.xml +++ b/pig-common/pig-common-oss/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pig-common - 3.7.3 + ${revision} pig-common-oss diff --git a/pig-common/pig-common-seata/pom.xml b/pig-common/pig-common-seata/pom.xml index 1364f91ce..1c5141869 100755 --- a/pig-common/pig-common-seata/pom.xml +++ b/pig-common/pig-common-seata/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pig-common - 3.7.3 + ${revision} pig-common-seata diff --git a/pig-common/pig-common-security/pom.xml b/pig-common/pig-common-security/pom.xml index fc69bd27f..56ef74cbe 100755 --- a/pig-common/pig-common-security/pom.xml +++ b/pig-common/pig-common-security/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 3.7.3 + ${revision} pig-common-security diff --git a/pig-common/pig-common-swagger/pom.xml b/pig-common/pig-common-swagger/pom.xml index f9f148618..c09b58635 100644 --- a/pig-common/pig-common-swagger/pom.xml +++ b/pig-common/pig-common-swagger/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pig-common - 3.7.3 + ${revision} pig-common-swagger diff --git a/pig-common/pig-common-xss/pom.xml b/pig-common/pig-common-xss/pom.xml index 56accc719..7d6f623e2 100755 --- a/pig-common/pig-common-xss/pom.xml +++ b/pig-common/pig-common-xss/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pig-common - 3.7.3 + ${revision} pig-common-xss diff --git a/pig-common/pom.xml b/pig-common/pom.xml index f4eb87b9a..3e7fdf7b6 100755 --- a/pig-common/pom.xml +++ b/pig-common/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 3.7.3 + ${revision} pig-common diff --git a/pig-gateway/pom.xml b/pig-gateway/pom.xml index 511e75043..564b61e48 100755 --- a/pig-gateway/pom.xml +++ b/pig-gateway/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 3.7.3 + ${revision} pig-gateway diff --git a/pig-register/pom.xml b/pig-register/pom.xml index b3503407d..d23fc9ca9 100644 --- a/pig-register/pom.xml +++ b/pig-register/pom.xml @@ -18,7 +18,7 @@ com.pig4cloud pig - 3.7.3 + ${revision} pig-register diff --git a/pig-upms/pig-upms-api/pom.xml b/pig-upms/pig-upms-api/pom.xml index 597ed8716..0af724eba 100755 --- a/pig-upms/pig-upms-api/pom.xml +++ b/pig-upms/pig-upms-api/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-upms - 3.7.3 + ${revision} pig-upms-api diff --git a/pig-upms/pig-upms-biz/pom.xml b/pig-upms/pig-upms-biz/pom.xml index dadda1733..0fbe1f420 100644 --- a/pig-upms/pig-upms-biz/pom.xml +++ b/pig-upms/pig-upms-biz/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-upms - 3.7.3 + ${revision} pig-upms-biz diff --git a/pig-upms/pom.xml b/pig-upms/pom.xml index 2e3edcbad..143c29810 100755 --- a/pig-upms/pom.xml +++ b/pig-upms/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 3.7.3 + ${revision} pig-upms diff --git a/pig-visual/pig-codegen/pom.xml b/pig-visual/pig-codegen/pom.xml index f1c4c6655..0d7f27d8c 100755 --- a/pig-visual/pig-codegen/pom.xml +++ b/pig-visual/pig-codegen/pom.xml @@ -22,7 +22,7 @@ com.pig4cloud pig-visual - 3.7.3 + ${revision} pig-codegen diff --git a/pig-visual/pig-monitor/pom.xml b/pig-visual/pig-monitor/pom.xml index 310647808..50322d3d8 100755 --- a/pig-visual/pig-monitor/pom.xml +++ b/pig-visual/pig-monitor/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-visual - 3.7.3 + ${revision} pig-monitor diff --git a/pig-visual/pig-quartz/pom.xml b/pig-visual/pig-quartz/pom.xml index f9b96ba6f..50a1f16bc 100644 --- a/pig-visual/pig-quartz/pom.xml +++ b/pig-visual/pig-quartz/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pig-visual - 3.7.3 + ${revision} 4.0.0 diff --git a/pig-visual/pom.xml b/pig-visual/pom.xml index 71002da27..f0678a4c1 100755 --- a/pig-visual/pom.xml +++ b/pig-visual/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 3.7.3 + ${revision} pig-visual diff --git a/pom.xml b/pom.xml index b59f1ac81..74bc45376 100755 --- a/pom.xml +++ b/pom.xml @@ -22,11 +22,13 @@ com.pig4cloud pig ${project.artifactId} - 3.7.3 + ${revision} pom https://www.pig4cloud.com + + 3.7.4 3.2.2 2023.0.0 2022.0.0.0 @@ -53,6 +55,7 @@ password 6.0.0 0.0.39 + 1.6.0 3.11.0 @@ -205,6 +208,32 @@ + + + org.codehaus.mojo + flatten-maven-plugin + ${flatten-maven-plugin.version} + + resolveCiFriendliesOnly + true + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + org.apache.maven.plugins maven-compiler-plugin