diff --git a/pom.xml b/pom.xml index 9754d14b..76699281 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ - sa-token-dependencies + sa-token-basic-dependencies sa-token-spring-boot2-dependencies sa-token-spring-boot3-dependencies sa-token-spring-boot4-dependencies @@ -80,12 +80,12 @@ cn.dev33 - sa-token-dependencies + sa-token-basic-dependencies ${project.version} pom import diff --git a/sa-token-dependencies/pom.xml b/sa-token-basic-dependencies/pom.xml similarity index 91% rename from sa-token-dependencies/pom.xml rename to sa-token-basic-dependencies/pom.xml index 9d0ace90..3769a3a0 100644 --- a/sa-token-dependencies/pom.xml +++ b/sa-token-basic-dependencies/pom.xml @@ -5,21 +5,16 @@ 4.0.0 cn.dev33 - sa-token-dependencies + sa-token-basic-dependencies ${revision} pom - sa-token-dependencies + sa-token-basic-dependencies Sa-Token Dependencies 1.44.0 - - - 3.4.3 - 4.0.3 - - 3.7.4 + 2.13.4.1 2.11.2 3.1.0 @@ -65,20 +60,6 @@ ${jakarta-servlet-api.version} - - - org.springframework.boot - spring-boot-starter-webmvc - ${springboot4.version} - - - - - io.projectreactor - reactor-core - ${reactor-core.version} - - com.fasterxml.jackson.core @@ -281,7 +262,7 @@ - + org.sonatype.oss oss-parent @@ -289,7 +270,7 @@ - + diff --git a/sa-token-doc/arch/dir-intro.md b/sa-token-doc/arch/dir-intro.md index 18779415..a1d9b7b7 100644 --- a/sa-token-doc/arch/dir-intro.md +++ b/sa-token-doc/arch/dir-intro.md @@ -7,7 +7,7 @@ ``` js ── sa-token ├── sa-token-core // [核心] Sa-Token 核心模块 - ├── sa-token-dependencies // [依赖] Sa-Token 依赖版本信息 + ├── sa-token-basic-dependencies // [依赖] Sa-Token 依赖版本信息 ├── sa-token-bom // [核心] Sa-Token bom 包 ├── sa-token-starter // [整合] Sa-Token 与其它框架整合 ├── sa-token-plugin // [插件] Sa-Token 插件合集 @@ -28,7 +28,7 @@ ``` js ── sa-token ├── sa-token-core // [核心] Sa-Token 核心模块 - ├── sa-token-dependencies // [依赖] Sa-Token 依赖版本信息 + ├── sa-token-basic-dependencies // [依赖] Sa-Token 依赖版本信息 ├── sa-token-bom // [核心] Sa-Token bom 包 ├── sa-token-starter // [整合] Sa-Token 与其它框架整合 ├── sa-token-servlet // [整合] Sa-Token 整合 Servlet 容器实现类包 diff --git a/sa-token-spring-boot2-dependencies/pom.xml b/sa-token-spring-boot2-dependencies/pom.xml index 1e961399..b81684fc 100644 --- a/sa-token-spring-boot2-dependencies/pom.xml +++ b/sa-token-spring-boot2-dependencies/pom.xml @@ -18,8 +18,9 @@ Sa-Token SpringBoot2 Dependencies - 2.7.18 - 5.3.39 + 2.7.18 + 5.3.39 + 3.7.4 @@ -29,33 +30,40 @@ org.springframework.boot spring-boot-starter - ${springboot.version} + ${springboot2.version} org.springframework.boot spring-boot-starter-web - ${springboot.version} + ${springboot2.version} org.springframework.boot spring-boot-configuration-processor - ${springboot.version} + ${springboot2.version} org.springframework spring-web - ${spring-web.low.version} + ${springboot2-spring.version} org.springframework spring-webmvc - ${spring-web.low.version} + ${springboot2-spring.version} + + + + + io.projectreactor + reactor-core + ${reactor-core.version} @@ -65,28 +73,28 @@ org.springframework.boot spring-boot-starter-data-redis - ${springboot.version} + ${springboot2.version} org.springframework.boot spring-boot-starter-thymeleaf - ${springboot.version} + ${springboot2.version} org.springframework.boot spring-boot-starter-aop - ${springboot.version} + ${springboot2.version} org.springframework.boot spring-boot-starter-actuator - ${springboot.version} + ${springboot2.version} diff --git a/sa-token-spring-boot3-dependencies/pom.xml b/sa-token-spring-boot3-dependencies/pom.xml index 37dc0218..996d1b66 100644 --- a/sa-token-spring-boot3-dependencies/pom.xml +++ b/sa-token-spring-boot3-dependencies/pom.xml @@ -19,7 +19,7 @@ 3.0.1 - 6.2.5 + 6.2.5 @@ -43,7 +43,7 @@ org.springframework spring-web - ${spring-web.version} + ${springboot3-spring.version}