wvp-pro.git - Gitblit

			@@ -6,7 +6,7 @@
			<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>
			@@ -14,6 +14,7 @@
			<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>
			@@ -277,7 +314,6 @@
			<dateFormat>yyyyMMdd</dateFormat>
			</configuration>
			</plugin>

			<plugin>
			<groupId>org.apache.maven.plugins</groupId>
			<artifactId>maven-surefire-plugin</artifactId>
			@@ -286,7 +322,6 @@
			<skipTests>true</skipTests>
			</configuration>
			</plugin>

			</plugins>
			<resources>
			<resource>