From 662ce3b484c3726369e4cf6b70fc875e57d2f66e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 15 四月 2021 11:52:14 +0800
Subject: [PATCH] Merge pull request #84 from lawrencehj/wvp-28181-2.0
---
pom.xml | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index b3accea..c1383e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,10 @@
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>2.1.4</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-security</artifactId>
+ </dependency>
<!-- druid鏁版嵁搴撹繛鎺ユ睜 -->
<dependency>
@@ -96,24 +100,21 @@
<version>1.2.10</version>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>org.apache.commons</groupId>-->
-<!-- <artifactId>commons-lang3</artifactId>-->
-<!-- <version>3.11</version>-->
-<!-- </dependency>-->
-
- <!--Swagger2 -->
+ <!--Swagger3 -->
<!--鍦ㄧ嚎鏂囨。 -->
<dependency>
<groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>2.9.2</version>
+ <artifactId>springfox-boot-starter</artifactId>
+ <version>3.0.0</version>
</dependency>
<dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>2.6.1</version>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>knife4j-spring-boot-starter</artifactId>
+ <version>3.0.2</version>
</dependency>
+
+
+ <!--鍙傛暟鏍￠獙 -->
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
@@ -129,10 +130,9 @@
<dependency>
<groupId>javax.sip</groupId>
<artifactId>jain-sip-ri</artifactId>
- <version>1.3.0-92</version>
- <scope>system</scope>
- <systemPath>${pom.basedir}/libs/jain-sip-ri-1.3.0-92.jar</systemPath>
+ <version>1.3.0-91</version>
</dependency>
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -169,14 +169,11 @@
</dependencies>
<build>
- <finalName>wvp-2.5.8</finalName>
+ <finalName>wvp-2.0</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <configuration>
- <includeSystemScope>true</includeSystemScope>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
--
Gitblit v1.8.0