From 54dcbe2a883107da7271d28dcd4f80862ebd4868 Mon Sep 17 00:00:00 2001 From: ruansheng Date: Sun, 6 Mar 2022 17:36:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 32 +++++++++++++++++-- sa-token-core/pom.xml | 3 +- sa-token-plugin/pom.xml | 3 +- sa-token-plugin/sa-token-alone-redis/pom.xml | 7 ++-- .../sa-token-context-dubbo/pom.xml | 5 +-- .../sa-token-dao-redis-jackson/pom.xml | 5 +-- sa-token-plugin/sa-token-dao-redis/pom.xml | 5 +-- .../sa-token-dialect-thymeleaf/pom.xml | 5 +-- sa-token-plugin/sa-token-jwt/pom.xml | 5 +-- sa-token-plugin/sa-token-oauth2/pom.xml | 5 +-- sa-token-plugin/sa-token-quick-login/pom.xml | 5 +-- sa-token-plugin/sa-token-spring-aop/pom.xml | 5 +-- sa-token-plugin/sa-token-temp-jwt/pom.xml | 5 +-- sa-token-starter/pom.xml | 3 +- .../sa-token-jboot-plugin/pom.xml | 7 ++-- .../sa-token-jfinal-plugin/pom.xml | 7 ++-- .../pom.xml | 7 ++-- sa-token-starter/sa-token-servlet/pom.xml | 5 +-- .../sa-token-solon-plugin/pom.xml | 5 +-- .../sa-token-spring-boot-starter/pom.xml | 7 ++-- sa-token-test/pom.xml | 3 +- sa-token-test/sa-token-core-test/pom.xml | 5 +-- sa-token-test/sa-token-jwt-test/pom.xml | 7 ++-- .../pom.xml | 5 +-- .../sa-token-springboot-test/pom.xml | 5 +-- 25 files changed, 104 insertions(+), 52 deletions(-) diff --git a/pom.xml b/pom.xml index b383464a..3f80d878 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ cn.dev33 sa-token-parent pom - 1.29.1.trial + ${revision} sa-token @@ -37,7 +37,7 @@ - 1.29.1.trial + 1.29.1.trial 1.8 utf-8 utf-8 @@ -86,6 +86,34 @@ UTF-8 + + + + org.codehaus.mojo + flatten-maven-plugin + 1.2.7 + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + + diff --git a/sa-token-core/pom.xml b/sa-token-core/pom.xml index b5f0444c..c2fe3fc9 100644 --- a/sa-token-core/pom.xml +++ b/sa-token-core/pom.xml @@ -7,7 +7,8 @@ cn.dev33 sa-token-parent - 1.29.1.trial + ${revision} + ../pom.xml jar diff --git a/sa-token-plugin/pom.xml b/sa-token-plugin/pom.xml index e83f9add..a2bcce0b 100644 --- a/sa-token-plugin/pom.xml +++ b/sa-token-plugin/pom.xml @@ -7,7 +7,8 @@ cn.dev33 sa-token-parent - 1.29.1.trial + ${revision} + ../pom.xml pom diff --git a/sa-token-plugin/sa-token-alone-redis/pom.xml b/sa-token-plugin/sa-token-alone-redis/pom.xml index 18a821ec..09c3c65f 100644 --- a/sa-token-plugin/sa-token-alone-redis/pom.xml +++ b/sa-token-plugin/sa-token-alone-redis/pom.xml @@ -7,7 +7,8 @@ cn.dev33 sa-token-plugin - 1.29.1.trial + ${revision} + ../pom.xml jar @@ -20,13 +21,13 @@ cn.dev33 sa-token-dao-redis - ${sa-token-version} + ${revision} true cn.dev33 sa-token-dao-redis-jackson - ${sa-token-version} + ${revision} true diff --git a/sa-token-plugin/sa-token-context-dubbo/pom.xml b/sa-token-plugin/sa-token-context-dubbo/pom.xml index 05ba36a6..158e75e2 100644 --- a/sa-token-plugin/sa-token-context-dubbo/pom.xml +++ b/sa-token-plugin/sa-token-context-dubbo/pom.xml @@ -7,7 +7,8 @@ cn.dev33 sa-token-plugin - 1.29.1.trial + ${revision} + ../pom.xml jar @@ -20,7 +21,7 @@ cn.dev33 sa-token-core - ${sa-token-version} + ${revision} diff --git a/sa-token-plugin/sa-token-dao-redis-jackson/pom.xml b/sa-token-plugin/sa-token-dao-redis-jackson/pom.xml index 86681824..980f43b8 100644 --- a/sa-token-plugin/sa-token-dao-redis-jackson/pom.xml +++ b/sa-token-plugin/sa-token-dao-redis-jackson/pom.xml @@ -7,7 +7,8 @@ cn.dev33 sa-token-plugin - 1.29.1.trial + ${revision} + ../pom.xml jar @@ -20,7 +21,7 @@ cn.dev33 sa-token-core - ${sa-token-version} + ${revision} diff --git a/sa-token-plugin/sa-token-dao-redis/pom.xml b/sa-token-plugin/sa-token-dao-redis/pom.xml index d0517dfc..ee08bc17 100644 --- a/sa-token-plugin/sa-token-dao-redis/pom.xml +++ b/sa-token-plugin/sa-token-dao-redis/pom.xml @@ -7,7 +7,8 @@ cn.dev33 sa-token-plugin - 1.29.1.trial + ${revision} + ../pom.xml jar @@ -20,7 +21,7 @@ cn.dev33 sa-token-core - ${sa-token-version} + ${revision} diff --git a/sa-token-plugin/sa-token-dialect-thymeleaf/pom.xml b/sa-token-plugin/sa-token-dialect-thymeleaf/pom.xml index 7a40fcf6..e2ce51dd 100644 --- a/sa-token-plugin/sa-token-dialect-thymeleaf/pom.xml +++ b/sa-token-plugin/sa-token-dialect-thymeleaf/pom.xml @@ -7,7 +7,8 @@ cn.dev33 sa-token-plugin - 1.29.1.trial + ${revision} + ../pom.xml jar @@ -20,7 +21,7 @@ cn.dev33 sa-token-core - ${sa-token-version} + ${revision} diff --git a/sa-token-plugin/sa-token-jwt/pom.xml b/sa-token-plugin/sa-token-jwt/pom.xml index 6b570944..f5bb8a20 100644 --- a/sa-token-plugin/sa-token-jwt/pom.xml +++ b/sa-token-plugin/sa-token-jwt/pom.xml @@ -7,7 +7,8 @@ cn.dev33 sa-token-plugin - 1.29.1.trial + ${revision} + ../pom.xml jar @@ -20,7 +21,7 @@ cn.dev33 sa-token-core - ${sa-token-version} + ${revision} diff --git a/sa-token-plugin/sa-token-oauth2/pom.xml b/sa-token-plugin/sa-token-oauth2/pom.xml index dabccd73..83a2e6a4 100644 --- a/sa-token-plugin/sa-token-oauth2/pom.xml +++ b/sa-token-plugin/sa-token-oauth2/pom.xml @@ -7,7 +7,8 @@ cn.dev33 sa-token-plugin - 1.29.1.trial + ${revision} + ../pom.xml jar @@ -20,7 +21,7 @@ cn.dev33 sa-token-core - ${sa-token-version} + ${revision} diff --git a/sa-token-plugin/sa-token-quick-login/pom.xml b/sa-token-plugin/sa-token-quick-login/pom.xml index d261edd8..104bd388 100644 --- a/sa-token-plugin/sa-token-quick-login/pom.xml +++ b/sa-token-plugin/sa-token-quick-login/pom.xml @@ -7,7 +7,8 @@ cn.dev33 sa-token-plugin - 1.29.1.trial + ${revision} + ../pom.xml jar @@ -20,7 +21,7 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${revision} diff --git a/sa-token-plugin/sa-token-spring-aop/pom.xml b/sa-token-plugin/sa-token-spring-aop/pom.xml index e89ffaed..b2516b93 100644 --- a/sa-token-plugin/sa-token-spring-aop/pom.xml +++ b/sa-token-plugin/sa-token-spring-aop/pom.xml @@ -7,7 +7,8 @@ cn.dev33 sa-token-plugin - 1.29.1.trial + ${revision} + ../pom.xml jar @@ -20,7 +21,7 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${revision} diff --git a/sa-token-plugin/sa-token-temp-jwt/pom.xml b/sa-token-plugin/sa-token-temp-jwt/pom.xml index 5ad6ff3b..0ef2c99b 100644 --- a/sa-token-plugin/sa-token-temp-jwt/pom.xml +++ b/sa-token-plugin/sa-token-temp-jwt/pom.xml @@ -7,7 +7,8 @@ cn.dev33 sa-token-plugin - 1.29.1.trial + ${revision} + ../pom.xml jar @@ -20,7 +21,7 @@ cn.dev33 sa-token-core - ${sa-token-version} + ${revision} diff --git a/sa-token-starter/pom.xml b/sa-token-starter/pom.xml index 9c7daac2..dd42372f 100644 --- a/sa-token-starter/pom.xml +++ b/sa-token-starter/pom.xml @@ -7,7 +7,8 @@ cn.dev33 sa-token-parent - 1.29.1.trial + ${revision} + ../pom.xml pom diff --git a/sa-token-starter/sa-token-jboot-plugin/pom.xml b/sa-token-starter/sa-token-jboot-plugin/pom.xml index 6be5457c..4015ae57 100644 --- a/sa-token-starter/sa-token-jboot-plugin/pom.xml +++ b/sa-token-starter/sa-token-jboot-plugin/pom.xml @@ -5,7 +5,8 @@ sa-token-starter cn.dev33 - 1.29.1.trial + ${revision} + ../pom.xml 4.0.0 jar @@ -28,12 +29,12 @@ cn.dev33 sa-token-core - ${sa-token-version} + ${revision} cn.dev33 sa-token-servlet - ${sa-token-version} + ${revision} diff --git a/sa-token-starter/sa-token-jfinal-plugin/pom.xml b/sa-token-starter/sa-token-jfinal-plugin/pom.xml index dc58db90..8604009c 100644 --- a/sa-token-starter/sa-token-jfinal-plugin/pom.xml +++ b/sa-token-starter/sa-token-jfinal-plugin/pom.xml @@ -5,7 +5,8 @@ sa-token-starter cn.dev33 - 1.29.1.trial + ${revision} + ../pom.xml 4.0.0 jar @@ -37,12 +38,12 @@ cn.dev33 sa-token-core - ${sa-token-version} + ${revision} cn.dev33 sa-token-servlet - ${sa-token-version} + ${revision} org.apache.commons diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/pom.xml b/sa-token-starter/sa-token-reactor-spring-boot-starter/pom.xml index 72063499..1cbbf220 100644 --- a/sa-token-starter/sa-token-reactor-spring-boot-starter/pom.xml +++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/pom.xml @@ -7,7 +7,8 @@ cn.dev33 sa-token-starter - 1.29.1.trial + ${revision} + ../pom.xml jar @@ -20,7 +21,7 @@ cn.dev33 sa-token-core - ${sa-token-version} + ${revision} @@ -47,7 +48,7 @@ cn.dev33 sa-token-oauth2 - ${sa-token-version} + ${revision} true diff --git a/sa-token-starter/sa-token-servlet/pom.xml b/sa-token-starter/sa-token-servlet/pom.xml index 86922ab4..04f508b9 100644 --- a/sa-token-starter/sa-token-servlet/pom.xml +++ b/sa-token-starter/sa-token-servlet/pom.xml @@ -7,7 +7,8 @@ cn.dev33 sa-token-starter - 1.29.1.trial + ${revision} + ../pom.xml jar @@ -20,7 +21,7 @@ cn.dev33 sa-token-core - ${sa-token-version} + ${revision} diff --git a/sa-token-starter/sa-token-solon-plugin/pom.xml b/sa-token-starter/sa-token-solon-plugin/pom.xml index 8b7841c2..1e3e3565 100644 --- a/sa-token-starter/sa-token-solon-plugin/pom.xml +++ b/sa-token-starter/sa-token-solon-plugin/pom.xml @@ -7,7 +7,8 @@ cn.dev33 sa-token-starter - 1.29.1.trial + ${revision} + ../pom.xml jar @@ -25,7 +26,7 @@ cn.dev33 sa-token-core - ${sa-token-version} + ${revision} diff --git a/sa-token-starter/sa-token-spring-boot-starter/pom.xml b/sa-token-starter/sa-token-spring-boot-starter/pom.xml index 92247f9b..eb0ab205 100644 --- a/sa-token-starter/sa-token-spring-boot-starter/pom.xml +++ b/sa-token-starter/sa-token-spring-boot-starter/pom.xml @@ -7,7 +7,8 @@ cn.dev33 sa-token-starter - 1.29.1.trial + ${revision} + ../pom.xml jar @@ -19,7 +20,7 @@ cn.dev33 sa-token-servlet - ${sa-token-version} + ${revision} org.springframework.boot @@ -30,7 +31,7 @@ cn.dev33 sa-token-oauth2 - ${sa-token-version} + ${revision} true diff --git a/sa-token-test/pom.xml b/sa-token-test/pom.xml index 0df054bc..f97e5142 100644 --- a/sa-token-test/pom.xml +++ b/sa-token-test/pom.xml @@ -7,7 +7,8 @@ cn.dev33 sa-token-parent - 1.29.1.trial + ${revision} + ../pom.xml pom diff --git a/sa-token-test/sa-token-core-test/pom.xml b/sa-token-test/sa-token-core-test/pom.xml index 737f795d..9dd5eec7 100644 --- a/sa-token-test/sa-token-core-test/pom.xml +++ b/sa-token-test/sa-token-core-test/pom.xml @@ -7,7 +7,8 @@ cn.dev33 sa-token-test - 1.29.1.trial + ${revision} + ../pom.xml jar @@ -19,7 +20,7 @@ cn.dev33 sa-token-core - ${sa-token-version} + ${revision} diff --git a/sa-token-test/sa-token-jwt-test/pom.xml b/sa-token-test/sa-token-jwt-test/pom.xml index 9398185d..43cd6c66 100644 --- a/sa-token-test/sa-token-jwt-test/pom.xml +++ b/sa-token-test/sa-token-jwt-test/pom.xml @@ -7,7 +7,8 @@ cn.dev33 sa-token-test - 1.29.1.trial + ${revision} + ../pom.xml jar @@ -19,12 +20,12 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${revision} cn.dev33 sa-token-jwt - ${sa-token-version} + ${revision} diff --git a/sa-token-test/sa-token-springboot-integrate-test/pom.xml b/sa-token-test/sa-token-springboot-integrate-test/pom.xml index 2935afe1..7b6683c2 100644 --- a/sa-token-test/sa-token-springboot-integrate-test/pom.xml +++ b/sa-token-test/sa-token-springboot-integrate-test/pom.xml @@ -7,7 +7,8 @@ cn.dev33 sa-token-test - 1.29.1.trial + ${revision} + ../pom.xml jar @@ -19,7 +20,7 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${revision} diff --git a/sa-token-test/sa-token-springboot-test/pom.xml b/sa-token-test/sa-token-springboot-test/pom.xml index e0b57668..fddd9d1f 100644 --- a/sa-token-test/sa-token-springboot-test/pom.xml +++ b/sa-token-test/sa-token-springboot-test/pom.xml @@ -7,7 +7,8 @@ cn.dev33 sa-token-test - 1.29.1.trial + ${revision} + ../pom.xml jar @@ -19,7 +20,7 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${revision}