From 8c9c52417e69af15638768704b0b53ba98482069 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 13 九月 2022 14:57:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev
---
pom.xml | 49 ++++++++++++++++++++++++-------------------------
1 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/pom.xml b/pom.xml
index f49ba5a..8882d75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,54 +6,46 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>4.2.0</version>
+ <version>4.3.0-beta2</version>
<name>RuoYi-Vue-Plus</name>
<url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
<description>RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺</description>
<properties>
- <ruoyi-vue-plus.version>4.2.0</ruoyi-vue-plus.version>
- <spring-boot.version>2.6.9</spring-boot.version>
+ <ruoyi-vue-plus.version>4.3.0-beta2</ruoyi-vue-plus.version>
+ <spring-boot.version>2.7.3</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
<spring-boot.mybatis>2.2.2</spring-boot.mybatis>
- <druid.version>1.2.11</druid.version>
- <springdoc.version>1.6.9</springdoc.version>
- <swagger-annotations.version>1.5.22</swagger-annotations.version>
+ <druid.version>1.2.12</druid.version>
+ <springdoc.version>1.6.11</springdoc.version>
<poi.version>5.2.2</poi.version>
<easyexcel.version>3.1.1</easyexcel.version>
<velocity.version>2.3</velocity.version>
<satoken.version>1.30.0</satoken.version>
<mybatis-plus.version>3.5.2</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.8.3</hutool.version>
- <okhttp.version>4.9.3</okhttp.version>
- <spring-boot-admin.version>2.6.7</spring-boot-admin.version>
- <redisson.version>3.17.4</redisson.version>
- <lock4j.version>2.2.1</lock4j.version>
- <dynamic-ds.version>3.5.1</dynamic-ds.version>
+ <hutool.version>5.8.6</hutool.version>
+ <okhttp.version>4.10.0</okhttp.version>
+ <spring-boot-admin.version>2.7.4</spring-boot-admin.version>
+ <redisson.version>3.17.6</redisson.version>
+ <lock4j.version>2.2.2</lock4j.version>
+ <dynamic-ds.version>3.5.2</dynamic-ds.version>
<tlog.version>1.4.3</tlog.version>
<xxl-job.version>2.3.1</xxl-job.version>
<lombok.version>1.18.24</lombok.version>
<!-- 缁熶竴 guava 鐗堟湰 瑙ｅ喅闅愬紡婕忔礊闂 -->
- <guava.version>30.0-jre</guava.version>
+ <guava.version>31.1-jre</guava.version>
<!-- OSS 閰嶇疆 -->
- <aws-java-sdk-s3.version>1.12.248</aws-java-sdk-s3.version>
+ <aws-java-sdk-s3.version>1.12.300</aws-java-sdk-s3.version>
<!-- SMS 閰嶇疆 -->
- <aliyun.sms.version>2.0.9</aliyun.sms.version>
- <tencent.sms.version>3.1.537</tencent.sms.version>
-
- <!-- docker 閰嶇疆 -->
- <docker.registry.url>localhost</docker.registry.url>
- <docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
- <docker.namespace>ruoyi</docker.namespace>
- <docker.plugin.version>1.2.2</docker.plugin.version>
-
+ <aliyun.sms.version>2.0.18</aliyun.sms.version>
+ <tencent.sms.version>3.1.591</tencent.sms.version>
</properties>
<!-- 渚濊禆澹版槑 -->
@@ -87,7 +79,7 @@
<dependency>
<groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-ui</artifactId>
+ <artifactId>springdoc-openapi-webmvc-core</artifactId>
<version>${springdoc.version}</version>
</dependency>
@@ -143,6 +135,12 @@
<groupId>cn.dev33</groupId>
<artifactId>sa-token-jwt</artifactId>
<version>${satoken.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- dynamic-datasource 澶氭暟鎹簮-->
@@ -343,7 +341,7 @@
<path>
<groupId>com.github.therapi</groupId>
<artifactId>therapi-runtime-javadoc-scribe</artifactId>
- <version>0.13.0</version>
+ <version>0.15.0</version>
</path>
<path>
<groupId>org.projectlombok</groupId>
@@ -435,3 +433,4 @@
</profiles>
</project>
+
--
Gitblit v1.9.3