From ed08c7ef77b3466e8f388fe3ea3f6a94f324fa4e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 22 三月 2023 09:27:17 +0800
Subject: [PATCH] Merge pull request #785 from xiaoQQya/wvp-28181-2.0
---
pom.xml | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 64d414d..a675c6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,9 +11,10 @@
<groupId>com.genersoft</groupId>
<artifactId>wvp-pro</artifactId>
- <version>2.3.2</version>
+ <version>2.6.7</version>
<name>web video platform</name>
<description>鍥芥爣28181瑙嗛骞冲彴</description>
+ <packaging>${project.packaging}</packaging>
<repositories>
<repository>
@@ -55,6 +56,42 @@
<asciidoctor.html.output.directory>${project.build.directory}/asciidoc/html</asciidoctor.html.output.directory>
<asciidoctor.pdf.output.directory>${project.build.directory}/asciidoc/pdf</asciidoctor.pdf.output.directory>
</properties>
+
+ <profiles>
+ <profile>
+ <id>jar</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <project.packaging>jar</project.packaging>
+ </properties>
+ </profile>
+ <profile>
+ <id>war</id>
+ <properties>
+ <project.packaging>war</project.packaging>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-jetty</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
<dependencies>
<dependency>
@@ -179,8 +216,6 @@
<version>4.10.0</version>
</dependency>
-
-
<!-- okhttp-digest -->
<dependency>
<groupId>io.github.rburgst</groupId>
@@ -189,10 +224,17 @@
</dependency>
<!-- https://mvnrepository.com/artifact/net.sf.kxml/kxml2 -->
+<!-- <dependency>-->
+<!-- <groupId>net.sf.kxml</groupId>-->
+<!-- <artifactId>kxml2</artifactId>-->
+<!-- <version>2.3.0</version>-->
+<!-- </dependency>-->
+
+ <!-- jwt瀹炵幇 -->
<dependency>
- <groupId>net.sf.kxml</groupId>
- <artifactId>kxml2</artifactId>
- <version>2.3.0</version>
+ <groupId>org.bitbucket.b_c</groupId>
+ <artifactId>jose4j</artifactId>
+ <version>0.9.3</version>
</dependency>
<!--鍙嶅悜浠ｇ悊-->
@@ -242,8 +284,8 @@
<artifactId>spring-boot-starter-test</artifactId>
<!-- <scope>test</scope>-->
</dependency>
- </dependencies>
+ </dependencies>
<build>
--
Gitblit v1.8.0