diff --git a/pom.xml b/pom.xml index 84fda9663..f576ee7cf 100644 --- a/pom.xml +++ b/pom.xml @@ -29,15 +29,15 @@ 1.8.3-snapshot - 1.8 + 17 ${java.version} ${java.version} - 3.0.0-M5 - 3.8.1 + 3.1.2 + 3.10.1 1.5.0 1.18.30 - 2.7.16 + 3.1.4 1.5.5.Final UTF-8 diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 79bfa3c41..ae7766c57 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -14,15 +14,15 @@ https://github.com/YunaiV/ruoyi-vue-pro - 1.8.3-snapshot + 1.8.2-snapshot 1.5.0 - 2.7.17 - 2021.0.5 - 2021.0.4.0 + 3.1.4 + 2022.0.4 + 2022.0.0.0 2.5 - 1.6.15 + 2.2.0 4.3.0 1.2.19 @@ -30,10 +30,8 @@ 3.5.3.2 3.6.1 1.4.6 - 3.18.0 + 3.23.4 8.1.2.141 - - 2.2.3 1.9.2 @@ -41,19 +39,19 @@ 2.3.1 2.2.3 - 1.7.1 + 2.1.0 - 8.12.0 - 2.7.10 + 9.0.0 + 3.1.6 0.33.0 - 7.2.11.RELEASE - 1.0.7 - 4.11.0 + 8.0.0.RELEASE + 1.0.10 + 5.2.0 - 6.8.0 + 7.0.0 - 1.0.8 + 2.0.3 1.16.1 1.18.30 1.5.5.Final @@ -67,21 +65,21 @@ 2.14.2 3.9.0 0.1.55 - 2.7.0 + 2.9.0 2.7.0 0.10.2 3.5.0 4.11.0 - 2.11.0 + 2.13.0 8.5.6 4.6.4 2.2.1 3.1.853 - 1.0.8 - 1.6.1 + 2.0.3 + 1.5.8 2.12.2 - 4.5.7.B + 4.5.5.B @@ -135,6 +133,11 @@ yudao-spring-boot-starter-biz-pay ${revision} + + cn.iocoder.cloud + yudao-spring-boot-starter-biz-weixin + ${revision} + cn.iocoder.cloud yudao-spring-boot-starter-biz-tenant @@ -145,6 +148,11 @@ yudao-spring-boot-starter-biz-data-permission ${revision} + + cn.iocoder.cloud + yudao-spring-boot-starter-biz-social + ${revision} + cn.iocoder.cloud yudao-spring-boot-starter-biz-error-code @@ -194,21 +202,15 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-websocket - ${revision} - - - - org.springdoc - springdoc-openapi-ui - ${springdoc.version} - - - com.github.xiaoymin - knife4j-openapi3-spring-boot-starter + com.github.xiaoymin + knife4j-openapi3-jakarta-spring-boot-starter ${knife4j.version} + + org.springdoc + springdoc-openapi-starter-webmvc-api + ${springdoc.version} + com.github.xiaoymin knife4j-gateway-spring-boot-starter @@ -221,15 +223,10 @@ yudao-spring-boot-starter-mybatis ${revision} - - org.springdoc - springdoc-openapi-webflux-ui - ${springdoc.version} - com.alibaba - druid-spring-boot-starter + druid-spring-boot-3-starter ${druid.version} @@ -301,12 +298,6 @@ ${revision} - - org.apache.rocketmq - rocketmq-spring-boot-starter - ${rocketmq-spring.version} - - cn.iocoder.cloud @@ -333,7 +324,7 @@ io.github.resilience4j - resilience4j-spring-boot2 + resilience4j-spring-boot3 ${resilience4j.version} @@ -625,12 +616,12 @@ com.github.binarywang - wx-java-mp-spring-boot-starter + weixin-java-mp ${weixin-java.version} com.github.binarywang - wx-java-miniapp-spring-boot-starter + wx-java-mp-spring-boot-starter ${weixin-java.version} diff --git a/yudao-framework/yudao-common/pom.xml b/yudao-framework/yudao-common/pom.xml index 0a19bf8e7..87d19abd8 100644 --- a/yudao-framework/yudao-common/pom.xml +++ b/yudao-framework/yudao-common/pom.xml @@ -60,8 +60,8 @@ org.springdoc - springdoc-openapi-ui - provided + springdoc-openapi-starter-webmvc-api + provided @@ -138,12 +138,6 @@ jsoup - - - org.springframework.boot - spring-boot-starter-test - test - diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml b/yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml index 33ccd0437..5956eb54a 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml @@ -56,7 +56,7 @@ com.alibaba - druid-spring-boot-starter + druid-spring-boot-3-starter com.baomidou diff --git a/yudao-framework/yudao-spring-boot-starter-web/pom.xml b/yudao-framework/yudao-spring-boot-starter-web/pom.xml index e9d27515f..2a0514a9f 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-web/pom.xml @@ -46,12 +46,12 @@ - com.github.xiaoymin - knife4j-openapi3-spring-boot-starter + com.github.xiaoymin + knife4j-openapi3-jakarta-spring-boot-starter - org.springdoc - springdoc-openapi-ui + org.springdoc + springdoc-openapi-starter-webmvc-api diff --git a/yudao-gateway/pom.xml b/yudao-gateway/pom.xml index fe7580c7d..349464f82 100644 --- a/yudao-gateway/pom.xml +++ b/yudao-gateway/pom.xml @@ -51,11 +51,6 @@ spring-cloud-starter-gateway - - javax.servlet - javax.servlet-api - - com.github.xiaoymin knife4j-gateway-spring-boot-starter diff --git a/yudao-module-infra/yudao-module-infra-api/pom.xml b/yudao-module-infra/yudao-module-infra-api/pom.xml index 4c36e323f..7522ce721 100644 --- a/yudao-module-infra/yudao-module-infra-api/pom.xml +++ b/yudao-module-infra/yudao-module-infra-api/pom.xml @@ -24,8 +24,8 @@ - org.springdoc - springdoc-openapi-ui + org.springdoc + springdoc-openapi-starter-webmvc-api provided diff --git a/yudao-module-pay/yudao-module-pay-api/pom.xml b/yudao-module-pay/yudao-module-pay-api/pom.xml index d517fa95c..52ec6b0ca 100644 --- a/yudao-module-pay/yudao-module-pay-api/pom.xml +++ b/yudao-module-pay/yudao-module-pay-api/pom.xml @@ -24,8 +24,8 @@ - org.springdoc - springdoc-openapi-ui + org.springdoc + springdoc-openapi-starter-webmvc-api provided diff --git a/yudao-module-system/yudao-module-system-api/pom.xml b/yudao-module-system/yudao-module-system-api/pom.xml index d816fa61e..57ddc0658 100644 --- a/yudao-module-system/yudao-module-system-api/pom.xml +++ b/yudao-module-system/yudao-module-system-api/pom.xml @@ -24,8 +24,8 @@ - org.springdoc - springdoc-openapi-ui + org.springdoc + springdoc-openapi-starter-webmvc-api provided