From 8acd64eac67b9b0a8d3f160b704faeebc91db0a0 Mon Sep 17 00:00:00 2001
From: mrjackwang <30337754+mrjackwang@users.noreply.github.com>
Date: 星期六, 04 三月 2023 21:37:39 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
pom.xml | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4c26f33..bcc3c36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,9 +11,10 @@
<groupId>com.genersoft</groupId>
<artifactId>wvp-pro</artifactId>
- <version>2.6.6</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>
@@ -242,8 +279,8 @@
<artifactId>spring-boot-starter-test</artifactId>
<!-- <scope>test</scope>-->
</dependency>
- </dependencies>
+ </dependencies>
<build>
--
Gitblit v1.8.0