From fa0660291055ec113f9982270c27ebc45bec16ce Mon Sep 17 00:00:00 2001
From: xingqiao <xingqiao@uni-ubi.com>
Date: 星期五, 26 八月 2022 11:53:28 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.com/ixingqiao/wvp-GB28181-pro into wvp-28181-2.0

---
 pom.xml |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2b9a838..ebba8a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,20 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-redis</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>redis.clients</groupId>
+					<artifactId>jedis</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>io.lettuce</groupId>
+					<artifactId>lettuce-core</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-pool2</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

--
Gitblit v1.8.0