From 7de73ebd2bc07a51f0f9db031d6f616bdcfe549c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 11 十月 2023 01:36:12 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
pom.xml | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index bb0de72..ce12f3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.7.2</version>
+ <version>2.7.9</version>
</parent>
<groupId>com.genersoft</groupId>
<artifactId>wvp-pro</artifactId>
- <version>2.6.8</version>
+ <version>2.6.9</version>
<name>web video platform</name>
<description>鍥芥爣28181瑙嗛骞冲彴</description>
<packaging>${project.packaging}</packaging>
@@ -207,6 +207,12 @@
<version>2.1.3</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>20.0</version>
+ </dependency>
+
<!-- json瑙ｆ瀽搴揻astjson2 -->
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
@@ -336,7 +342,6 @@
<dateFormat>yyyyMMdd</dateFormat>
</configuration>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -345,7 +350,6 @@
<skipTests>true</skipTests>
</configuration>
</plugin>
-
</plugins>
<resources>
<resource>
--
Gitblit v1.8.0