From 778969f1eb3739dfd13d0b53fae93401015450f4 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期四, 28 七月 2022 16:21:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 --- pom.xml | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 7ad53db..1209124 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>com.genersoft</groupId> <artifactId>wvp-pro</artifactId> - <version>2.0.2</version> + <version>2.3.1</version> <name>web video platform</name> <description>鍥芥爣28181瑙嗛骞冲彴</description> @@ -101,13 +101,6 @@ <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鍒嗛〉鎻掍欢 --> <dependency> <groupId>com.github.pagehelper</groupId> @@ -166,8 +159,9 @@ <dependency> <groupId>com.alibaba</groupId> <artifactId>fastjson</artifactId> - <version>1.2.73</version> + <version>1.2.83</version> </dependency> + <!-- okhttp --> <dependency> @@ -187,9 +181,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 +250,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 +258,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 +268,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 +277,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