diff --git a/pom.xml b/pom.xml index b295d155..d56c084b 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,7 @@ + sa-token-dependencies sa-token-core sa-token-starter sa-token-plugin @@ -37,31 +38,10 @@ - 1.31.2.temp + 1.31.2.temp 1.8 utf-8 utf-8 - - - 2.5.12 - 5.3.7 - 3.1.4.RELEASE - 2.13.4.1 - 2.11.2 - 3.1.0 - 3.0.9.RELEASE - 1.10.9 - 1.9.1 - 1.4.3 - 4.9.17 - 3.14.4 - 2.5.0 - 2.7.18 - 2.10.1.RELEASE - 5.8.5 - 0.9.1 - 1.2.83 - 2.0.15 @@ -96,134 +76,17 @@ - - cn.dev33 - sa-token-core - ${revision} - - - - - cn.dev33 - sa-token-plugin - ${revision} - - - cn.dev33 - sa-token-alone-redis - ${revision} - - - cn.dev33 - sa-token-context-dubbo - ${revision} - - - cn.dev33 - sa-token-context-grpc - ${revision} - - - cn.dev33 - sa-token-dao-redis - ${revision} - - - cn.dev33 - sa-token-dao-redis-fastjson - ${revision} - - - cn.dev33 - sa-token-dao-redis-fastjson2 - ${revision} - - - cn.dev33 - sa-token-dao-redis-jackson - ${revision} - - - cn.dev33 - sa-token-dao-redisx - ${revision} - - - cn.dev33 - sa-token-dialect-thymeleaf - ${revision} - - - cn.dev33 - sa-token-jwt - ${revision} - - - cn.dev33 - sa-token-oauth2 - ${revision} - - - cn.dev33 - sa-token-quick-login - ${revision} - - - cn.dev33 - sa-token-spring-aop - ${revision} - - - cn.dev33 - sa-token-sso - ${revision} - - - cn.dev33 - sa-token-temp-jwt - ${revision} - - - - - - - cn.dev33 - sa-token-starter - ${revision} - - - cn.dev33 - sa-token-jboot-plugin - ${revision} - - - cn.dev33 - sa-token-jfinal-plugin - ${revision} - - - cn.dev33 - sa-token-reactor-spring-boot-starter - ${revision} - - - cn.dev33 - sa-token-servlet - ${revision} - - - cn.dev33 - sa-token-solon-plugin - ${revision} - - - cn.dev33 - sa-token-spring-boot-starter - ${revision} - - + + cn.dev33 + sa-token-dependencies + ${project.version} + pom + import + + + + diff --git a/sa-token-dependencies/.gitignore b/sa-token-dependencies/.gitignore new file mode 100644 index 00000000..8122f47c --- /dev/null +++ b/sa-token-dependencies/.gitignore @@ -0,0 +1,13 @@ +target/ + +node_modules/ +bin/ +.settings/ +unpackage/ +.classpath +.project + +.factorypath + +.idea/ +.iml \ No newline at end of file diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml new file mode 100644 index 00000000..ba82b392 --- /dev/null +++ b/sa-token-dependencies/pom.xml @@ -0,0 +1,343 @@ + + + 4.0.0 + + cn.dev33 + sa-token-dependencies + ${revision} + pom + Sa-Token Dependencies + Sa-Token Dependencies + + + 1.31.2.temp + + + 2.5.12 + 5.3.7 + 3.1.4.RELEASE + 2.13.4.1 + 2.11.2 + 3.1.0 + 3.0.9.RELEASE + 1.10.9 + 1.9.1 + 1.4.3 + 4.9.17 + 3.14.4 + 2.5.0 + 2.7.18 + 2.10.1.RELEASE + 5.8.5 + 0.9.1 + 1.2.83 + 2.0.15 + + + + + + + + + javax.servlet + javax.servlet-api + ${servlet-api.version} + + + + + org.springframework.boot + spring-boot-starter-web + ${springboot.version} + + + + + org.springframework.boot + spring-boot-starter + ${springboot.version} + + + + + org.springframework + spring-web + ${spring-web.version} + + + + + io.projectreactor + reactor-core + ${reactor-core.version} + + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-databind.version} + + + + + org.noear + solon + ${solon.version} + + + + + io.jboot + jboot + ${jboot.version} + + + + + com.jfinal + jfinal + ${jfinal.version} + + + + org.springframework.boot + spring-boot-configuration-processor + ${springboot.version} + + + + + + org.springframework.boot + spring-boot-starter-data-redis + ${springboot.version} + + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson-datatype-jsr310.version} + + + + + com.alibaba + fastjson + ${fastjson.version} + + + + + com.alibaba.fastjson2 + fastjson2 + ${fastjson2.version} + + + + + org.noear + redisx + ${noear-redisx.version} + + + + + org.noear + solon-test + ${solon-test.version} + + + + + org.apache.commons + commons-pool2 + ${commons-pool2.version} + + + + + org.thymeleaf + thymeleaf + ${thymeleaf.version} + + + + + org.springframework.boot + spring-boot-starter-thymeleaf + ${springboot.version} + + + + + org.springframework.boot + spring-boot-starter-aop + ${springboot.version} + + + + + cn.hutool + hutool-jwt + ${hutool-jwt.version} + + + + + org.apache.dubbo + dubbo + ${dubbo.version} + + + + + net.devh + grpc-spring-boot-starter + ${grpc-spring-boot-starter.version} + + + + io.jsonwebtoken + jjwt + ${jjwt.version} + + + + + + + cn.dev33 + sa-token-core + ${revision} + + + + + cn.dev33 + sa-token-starter + ${revision} + + + cn.dev33 + sa-token-jboot-plugin + ${revision} + + + cn.dev33 + sa-token-jfinal-plugin + ${revision} + + + cn.dev33 + sa-token-reactor-spring-boot-starter + ${revision} + + + cn.dev33 + sa-token-servlet + ${revision} + + + cn.dev33 + sa-token-solon-plugin + ${revision} + + + cn.dev33 + sa-token-spring-boot-starter + ${revision} + + + + + + cn.dev33 + sa-token-plugin + ${revision} + + + cn.dev33 + sa-token-alone-redis + ${revision} + + + cn.dev33 + sa-token-context-dubbo + ${revision} + + + cn.dev33 + sa-token-context-grpc + ${revision} + + + cn.dev33 + sa-token-dao-redis + ${revision} + + + cn.dev33 + sa-token-dao-redis-fastjson + ${revision} + + + cn.dev33 + sa-token-dao-redis-fastjson2 + ${revision} + + + cn.dev33 + sa-token-dao-redis-jackson + ${revision} + + + cn.dev33 + sa-token-dao-redisx + ${revision} + + + cn.dev33 + sa-token-dialect-thymeleaf + ${revision} + + + cn.dev33 + sa-token-jwt + ${revision} + + + cn.dev33 + sa-token-oauth2 + ${revision} + + + cn.dev33 + sa-token-quick-login + ${revision} + + + cn.dev33 + sa-token-spring-aop + ${revision} + + + cn.dev33 + sa-token-sso + ${revision} + + + cn.dev33 + sa-token-temp-jwt + ${revision} + + + + + + + \ No newline at end of file diff --git a/sa-token-plugin/pom.xml b/sa-token-plugin/pom.xml index 4ab2d496..71e22215 100644 --- a/sa-token-plugin/pom.xml +++ b/sa-token-plugin/pom.xml @@ -18,12 +18,12 @@ - sa-token-alone-redis sa-token-dao-redis sa-token-dao-redis-jackson sa-token-dao-redis-fastjson sa-token-dao-redis-fastjson2 sa-token-dao-redisx + sa-token-alone-redis sa-token-dialect-thymeleaf sa-token-sso sa-token-oauth2 @@ -40,7 +40,6 @@ org.springframework.boot spring-boot-configuration-processor - ${springboot.version} true diff --git a/sa-token-plugin/sa-token-alone-redis/pom.xml b/sa-token-plugin/sa-token-alone-redis/pom.xml index 8ed4f2a0..f20309de 100644 --- a/sa-token-plugin/sa-token-alone-redis/pom.xml +++ b/sa-token-plugin/sa-token-alone-redis/pom.xml @@ -42,7 +42,6 @@ org.apache.commons commons-pool2 - ${commons-pool2.version} true diff --git a/sa-token-plugin/sa-token-context-dubbo/pom.xml b/sa-token-plugin/sa-token-context-dubbo/pom.xml index 4c241a6b..010d0c71 100644 --- a/sa-token-plugin/sa-token-context-dubbo/pom.xml +++ b/sa-token-plugin/sa-token-context-dubbo/pom.xml @@ -27,7 +27,6 @@ org.apache.dubbo dubbo - ${dubbo.version} com.alibaba fastjson - ${fastjson.version} \ No newline at end of file diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson2/pom.xml b/sa-token-plugin/sa-token-dao-redis-fastjson2/pom.xml index 8e1368fb..99fea3b8 100644 --- a/sa-token-plugin/sa-token-dao-redis-fastjson2/pom.xml +++ b/sa-token-plugin/sa-token-dao-redis-fastjson2/pom.xml @@ -22,13 +22,11 @@ org.springframework.boot spring-boot-starter-data-redis - ${springboot.version} com.alibaba.fastjson2 fastjson2 - ${fastjson2.version} \ No newline at end of file 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 0a78d610..675e5862 100644 --- a/sa-token-plugin/sa-token-dao-redis-jackson/pom.xml +++ b/sa-token-plugin/sa-token-dao-redis-jackson/pom.xml @@ -26,20 +26,17 @@ org.springframework.boot spring-boot-starter-data-redis - ${springboot.version} com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} true com.fasterxml.jackson.datatype jackson-datatype-jsr310 - ${jackson-datatype-jsr310.version} true diff --git a/sa-token-plugin/sa-token-dao-redis/pom.xml b/sa-token-plugin/sa-token-dao-redis/pom.xml index d5995eeb..f6e98186 100644 --- a/sa-token-plugin/sa-token-dao-redis/pom.xml +++ b/sa-token-plugin/sa-token-dao-redis/pom.xml @@ -26,7 +26,6 @@ org.springframework.boot spring-boot-starter-data-redis - ${springboot.version} diff --git a/sa-token-plugin/sa-token-dao-redisx/pom.xml b/sa-token-plugin/sa-token-dao-redisx/pom.xml index f578a389..91a50216 100644 --- a/sa-token-plugin/sa-token-dao-redisx/pom.xml +++ b/sa-token-plugin/sa-token-dao-redisx/pom.xml @@ -26,13 +26,11 @@ org.noear redisx - ${noear-redisx.version} org.noear solon-test - ${solon-test.version} test diff --git a/sa-token-plugin/sa-token-dialect-thymeleaf/pom.xml b/sa-token-plugin/sa-token-dialect-thymeleaf/pom.xml index 7492e608..81a72298 100644 --- a/sa-token-plugin/sa-token-dialect-thymeleaf/pom.xml +++ b/sa-token-plugin/sa-token-dialect-thymeleaf/pom.xml @@ -26,14 +26,12 @@ org.thymeleaf thymeleaf - ${thymeleaf.version} true org.springframework.boot spring-boot-configuration-processor - ${springboot.version} true diff --git a/sa-token-plugin/sa-token-jwt/pom.xml b/sa-token-plugin/sa-token-jwt/pom.xml index 296d6acc..eb878f6a 100644 --- a/sa-token-plugin/sa-token-jwt/pom.xml +++ b/sa-token-plugin/sa-token-jwt/pom.xml @@ -26,7 +26,6 @@ cn.hutool hutool-jwt - ${hutool-jwt.version} diff --git a/sa-token-plugin/sa-token-quick-login/pom.xml b/sa-token-plugin/sa-token-quick-login/pom.xml index 6b75a3a0..1e2d94e1 100644 --- a/sa-token-plugin/sa-token-quick-login/pom.xml +++ b/sa-token-plugin/sa-token-quick-login/pom.xml @@ -26,7 +26,6 @@ org.springframework.boot spring-boot-starter-thymeleaf - ${springboot.version} diff --git a/sa-token-plugin/sa-token-spring-aop/pom.xml b/sa-token-plugin/sa-token-spring-aop/pom.xml index c33b053c..572a9e92 100644 --- a/sa-token-plugin/sa-token-spring-aop/pom.xml +++ b/sa-token-plugin/sa-token-spring-aop/pom.xml @@ -26,7 +26,6 @@ org.springframework.boot spring-boot-starter-aop - ${springboot.version} diff --git a/sa-token-plugin/sa-token-temp-jwt/pom.xml b/sa-token-plugin/sa-token-temp-jwt/pom.xml index 886a9827..204c0a8f 100644 --- a/sa-token-plugin/sa-token-temp-jwt/pom.xml +++ b/sa-token-plugin/sa-token-temp-jwt/pom.xml @@ -26,15 +26,7 @@ io.jsonwebtoken jjwt - ${jjwt.version} - - diff --git a/sa-token-starter/sa-token-jboot-plugin/pom.xml b/sa-token-starter/sa-token-jboot-plugin/pom.xml index 2587da2f..9714a26a 100644 --- a/sa-token-starter/sa-token-jboot-plugin/pom.xml +++ b/sa-token-starter/sa-token-jboot-plugin/pom.xml @@ -24,7 +24,6 @@ io.jboot jboot - ${jboot.version} provided diff --git a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaRedisCache.java b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaRedisCache.java index 248aff51..fa2e3664 100644 --- a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaRedisCache.java +++ b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaRedisCache.java @@ -18,7 +18,7 @@ import java.util.List; * sa 缓存处理 */ @JbootSpi("sacache") -@SuppressWarnings({"deprecation", "unchecked", "rawtypes"}) +@SuppressWarnings({"unchecked", "rawtypes"}) public class SaRedisCache implements JbootCache { protected JbootRedisConfig config; protected JedisPool jedisPool; diff --git a/sa-token-starter/sa-token-jfinal-plugin/pom.xml b/sa-token-starter/sa-token-jfinal-plugin/pom.xml index 157749df..00604d28 100644 --- a/sa-token-starter/sa-token-jfinal-plugin/pom.xml +++ b/sa-token-starter/sa-token-jfinal-plugin/pom.xml @@ -32,7 +32,6 @@ com.jfinal jfinal - ${jfinal.version} provided @@ -46,7 +45,6 @@ org.apache.commons commons-pool2 - 2.11.1 test 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 02ea0d1e..eca6eb5a 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 @@ -27,7 +27,6 @@ org.springframework.boot spring-boot-starter - ${springboot.version} true @@ -35,7 +34,6 @@ org.springframework spring-web - ${spring-web.version} true @@ -43,7 +41,6 @@ io.projectreactor reactor-core - ${reactor-core.version} true @@ -51,7 +48,6 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} true @@ -59,7 +55,6 @@ org.springframework.boot spring-boot-configuration-processor - ${springboot.version} true diff --git a/sa-token-starter/sa-token-servlet/pom.xml b/sa-token-starter/sa-token-servlet/pom.xml index 8efc1c9b..e3fb2ca7 100644 --- a/sa-token-starter/sa-token-servlet/pom.xml +++ b/sa-token-starter/sa-token-servlet/pom.xml @@ -27,7 +27,6 @@ javax.servlet javax.servlet-api - ${servlet-api.version} true diff --git a/sa-token-starter/sa-token-solon-plugin/pom.xml b/sa-token-starter/sa-token-solon-plugin/pom.xml index 01013f10..57a545c9 100644 --- a/sa-token-starter/sa-token-solon-plugin/pom.xml +++ b/sa-token-starter/sa-token-solon-plugin/pom.xml @@ -25,7 +25,6 @@ org.noear solon - ${solon.version} 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 1c0ba477..a05bf634 100644 --- a/sa-token-starter/sa-token-spring-boot-starter/pom.xml +++ b/sa-token-starter/sa-token-spring-boot-starter/pom.xml @@ -23,18 +23,16 @@ sa-token-servlet - + org.springframework.boot spring-boot-starter-web - ${springboot.version} org.springframework.boot spring-boot-configuration-processor - ${springboot.version} true diff --git a/sa-token-test/pom.xml b/sa-token-test/pom.xml index 2cc2892b..0f3a42aa 100644 --- a/sa-token-test/pom.xml +++ b/sa-token-test/pom.xml @@ -38,7 +38,6 @@ org.springframework.boot spring-boot-configuration-processor - 2.5.12 true