From 81755a280d7a6715a5fe40011bbe60e9ec577748 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 28 十一月 2021 15:10:05 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-common/pom.xml | 34 +++++++---------------------------
1 files changed, 7 insertions(+), 27 deletions(-)
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index dd9c182..4445de2 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
- <version>3.2.0</version>
+ <version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,8 +37,8 @@
<!-- 鑷畾涔夐獙璇佹敞瑙� -->
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<!--甯哥敤宸ュ叿绫� -->
@@ -70,22 +70,16 @@
<artifactId>snakeyaml</artifactId>
</dependency>
- <!--Token鐢熸垚涓庤В鏋�-->
+ <!-- Token鐢熸垚涓庤В鏋�-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
</dependency>
- <!-- redis 缂撳瓨鎿嶄綔 -->
+ <!-- jdk11 缂哄け渚濊禆 jaxb-->
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-redis</artifactId>
- </dependency>
-
- <!-- pool 瀵硅薄姹� -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
</dependency>
<!-- servlet鍖� -->
@@ -109,16 +103,6 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-openfeign</artifactId>
- </dependency>
-
- <dependency>
- <groupId>io.github.openfeign</groupId>
- <artifactId>feign-okhttp</artifactId>
</dependency>
<dependency>
@@ -167,10 +151,6 @@
<artifactId>tlog-webroot</artifactId>
</dependency>
- <dependency>
- <groupId>com.yomahub</groupId>
- <artifactId>tlog-feign</artifactId>
- </dependency>
</dependencies>
</project>
--
Gitblit v1.9.3