diff --git a/pom.xml b/pom.xml index 76699281..2dd4a8fd 100644 --- a/pom.xml +++ b/pom.xml @@ -18,10 +18,8 @@ - sa-token-basic-dependencies - sa-token-spring-boot2-dependencies - sa-token-spring-boot3-dependencies - sa-token-spring-boot4-dependencies + sa-token-dependencies + sa-token-special-dependencies sa-token-bom sa-token-core sa-token-starter @@ -80,12 +78,12 @@ cn.dev33 - sa-token-basic-dependencies + sa-token-dependencies ${project.version} pom import diff --git a/sa-token-core/pom.xml b/sa-token-core/pom.xml index 8dc854bc..71c7f8b6 100644 --- a/sa-token-core/pom.xml +++ b/sa-token-core/pom.xml @@ -16,7 +16,7 @@ A Java Web lightweight authority authentication framework, comprehensive function, easy to use - + diff --git a/sa-token-demo/sa-token-demo-springboot3-redis/pom.xml b/sa-token-demo/sa-token-demo-springboot3-redis/pom.xml index 14b4307c..8903c3fa 100644 --- a/sa-token-demo/sa-token-demo-springboot3-redis/pom.xml +++ b/sa-token-demo/sa-token-demo-springboot3-redis/pom.xml @@ -10,7 +10,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.1 + 3.5.11 diff --git a/sa-token-basic-dependencies/pom.xml b/sa-token-dependencies/pom.xml similarity index 98% rename from sa-token-basic-dependencies/pom.xml rename to sa-token-dependencies/pom.xml index 3769a3a0..1da1dfbb 100644 --- a/sa-token-basic-dependencies/pom.xml +++ b/sa-token-dependencies/pom.xml @@ -5,10 +5,10 @@ 4.0.0 cn.dev33 - sa-token-basic-dependencies + sa-token-dependencies ${revision} pom - sa-token-basic-dependencies + sa-token-dependencies Sa-Token Dependencies @@ -283,7 +283,7 @@ UTF-8 - + org.codehaus.mojo @@ -310,7 +310,7 @@ - + diff --git a/sa-token-doc/arch/dir-intro.md b/sa-token-doc/arch/dir-intro.md index a1d9b7b7..18779415 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-basic-dependencies // [依赖] Sa-Token 依赖版本信息 + ├── sa-token-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-basic-dependencies // [依赖] Sa-Token 依赖版本信息 + ├── sa-token-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-plugin/pom.xml b/sa-token-plugin/pom.xml index 77fa4694..3eb1958b 100644 --- a/sa-token-plugin/pom.xml +++ b/sa-token-plugin/pom.xml @@ -54,17 +54,6 @@ sa-token-redisson-spring-boot-starter - - - - - - diff --git a/sa-token-special-dependencies/pom.xml b/sa-token-special-dependencies/pom.xml new file mode 100644 index 00000000..d6c43f18 --- /dev/null +++ b/sa-token-special-dependencies/pom.xml @@ -0,0 +1,25 @@ + + + 4.0.0 + + + cn.dev33 + sa-token-parent + ${revision} + ../pom.xml + + + pom + sa-token-special-dependencies + sa-token-special-dependencies + Sa-Token Special Dependencies - 聚合 Spring Boot 各版本依赖 + + + sa-token-spring-boot2-dependencies + sa-token-spring-boot3-dependencies + sa-token-spring-boot4-dependencies + + + diff --git a/sa-token-spring-boot2-dependencies/pom.xml b/sa-token-special-dependencies/sa-token-spring-boot2-dependencies/pom.xml similarity index 98% rename from sa-token-spring-boot2-dependencies/pom.xml rename to sa-token-special-dependencies/sa-token-spring-boot2-dependencies/pom.xml index b81684fc..1e59f34f 100644 --- a/sa-token-spring-boot2-dependencies/pom.xml +++ b/sa-token-special-dependencies/sa-token-spring-boot2-dependencies/pom.xml @@ -7,7 +7,7 @@ cn.dev33 - sa-token-parent + sa-token-special-dependencies ${revision} ../pom.xml diff --git a/sa-token-spring-boot3-dependencies/pom.xml b/sa-token-special-dependencies/sa-token-spring-boot3-dependencies/pom.xml similarity index 90% rename from sa-token-spring-boot3-dependencies/pom.xml rename to sa-token-special-dependencies/sa-token-spring-boot3-dependencies/pom.xml index 996d1b66..17f26865 100644 --- a/sa-token-spring-boot3-dependencies/pom.xml +++ b/sa-token-special-dependencies/sa-token-spring-boot3-dependencies/pom.xml @@ -7,7 +7,7 @@ cn.dev33 - sa-token-parent + sa-token-special-dependencies ${revision} ../pom.xml @@ -18,8 +18,8 @@ Sa-Token SpringBoot3 Dependencies - 3.0.1 - 6.2.5 + 3.5.11 + 6.2.16 diff --git a/sa-token-spring-boot4-dependencies/pom.xml b/sa-token-special-dependencies/sa-token-spring-boot4-dependencies/pom.xml similarity index 97% rename from sa-token-spring-boot4-dependencies/pom.xml rename to sa-token-special-dependencies/sa-token-spring-boot4-dependencies/pom.xml index c7e820c6..767a5335 100644 --- a/sa-token-spring-boot4-dependencies/pom.xml +++ b/sa-token-special-dependencies/sa-token-spring-boot4-dependencies/pom.xml @@ -7,7 +7,7 @@ cn.dev33 - sa-token-parent + sa-token-special-dependencies ${revision} ../pom.xml diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/Placeholder.java similarity index 88% rename from sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java rename to sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/Placeholder.java index 3888dc13..a6ca3031 100644 --- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java +++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/Placeholder.java @@ -14,7 +14,15 @@ * limitations under the License. */ -/** - * Sa-Token 集成 Reactor 响应式编程 (SpringBoot 3.x) - */ package cn.dev33.satoken.reactor; + + +/** + * 占位符 + * + * @author click33 + * @since 1.45.0 + */ +public class Placeholder { + +} diff --git a/sa-token-starter/sa-token-reactor-spring-boot4-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java b/sa-token-starter/sa-token-reactor-spring-boot4-starter/src/main/java/cn/dev33/satoken/reactor/Placeholder.java similarity index 88% rename from sa-token-starter/sa-token-reactor-spring-boot4-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java rename to sa-token-starter/sa-token-reactor-spring-boot4-starter/src/main/java/cn/dev33/satoken/reactor/Placeholder.java index 74cf87f1..a6ca3031 100644 --- a/sa-token-starter/sa-token-reactor-spring-boot4-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java +++ b/sa-token-starter/sa-token-reactor-spring-boot4-starter/src/main/java/cn/dev33/satoken/reactor/Placeholder.java @@ -14,7 +14,15 @@ * limitations under the License. */ -/** - * Sa-Token 集成 Reactor 响应式编程 (SpringBoot 4.x) - */ package cn.dev33.satoken.reactor; + + +/** + * 占位符 + * + * @author click33 + * @since 1.45.0 + */ +public class Placeholder { + +} diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/Placeholder.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/Placeholder.java new file mode 100644 index 00000000..72c34240 --- /dev/null +++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/Placeholder.java @@ -0,0 +1,28 @@ +/* + * Copyright 2020-2099 sa-token.cc + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package cn.dev33.satoken; + + +/** + * 占位符 + * + * @author click33 + * @since 1.45.0 + */ +public class Placeholder { + +} diff --git a/sa-token-starter/sa-token-spring-boot4-starter/src/main/java/cn/dev33/satoken/Placeholder.java b/sa-token-starter/sa-token-spring-boot4-starter/src/main/java/cn/dev33/satoken/Placeholder.java new file mode 100644 index 00000000..72c34240 --- /dev/null +++ b/sa-token-starter/sa-token-spring-boot4-starter/src/main/java/cn/dev33/satoken/Placeholder.java @@ -0,0 +1,28 @@ +/* + * Copyright 2020-2099 sa-token.cc + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package cn.dev33.satoken; + + +/** + * 占位符 + * + * @author click33 + * @since 1.45.0 + */ +public class Placeholder { + +}