From 646c3e41b7fac40acbdb7bbfec5608daab2a28d3 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 28 七月 2022 16:24:51 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
---
pom.xml | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 34a07e1..ecf1aff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
<groupId>com.genersoft</groupId>
<artifactId>wvp-pro</artifactId>
- <version>2.2.1</version>
+ <version>2.3.1</version>
<name>web video platform</name>
<description>鍥芥爣28181瑙嗛骞冲彴</description>
@@ -61,6 +61,13 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
+ <exclusions>
+ <!-- 鍘绘帀 Lettuce 鐨勪緷璧栵紝 Spring Boot 浼樺厛浣跨敤 Lettuce 浣滀负 Redis 瀹㈡埛绔� -->
+ <exclusion>
+ <groupId>io.lettuce</groupId>
+ <artifactId>lettuce-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -75,6 +82,12 @@
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>2.1.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -84,7 +97,6 @@
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
- <version>${jedis-version}</version>
</dependency>
<!-- druid鏁版嵁搴撹繛鎺ユ睜 -->
@@ -99,13 +111,6 @@
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.22</version>
- </dependency>
-
- <!-- 娣诲姞sqlite-jdbc鏁版嵁搴撻┍鍔� -->
- <dependency>
- <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId>
- <version>3.32.3.2</version>
</dependency>
<!--Mybatis鍒嗛〉鎻掍欢 -->
@@ -166,8 +171,9 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
- <version>1.2.73</version>
+ <version>1.2.83</version>
</dependency>
+
<!-- okhttp -->
<dependency>
@@ -187,9 +193,9 @@
<!-- okhttp-digest -->
<dependency>
- <groupId>com.burgstaller</groupId>
+ <groupId>io.github.rburgst</groupId>
<artifactId>okhttp-digest</artifactId>
- <version>2.1</version>
+ <version>2.5</version>
</dependency>
<!-- https://mvnrepository.com/artifact/net.sf.kxml/kxml2 -->
@@ -256,6 +262,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
+ <version>2.3.5.RELEASE</version>
<configuration>
<includeSystemScope>true</includeSystemScope>
</configuration>
@@ -263,6 +270,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -272,6 +280,7 @@
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
+ <version>3.0.1</version>
<configuration>
<offline>true</offline>
</configuration>
@@ -280,6 +289,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.2</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
--
Gitblit v1.8.0