|
@@ -40,12 +40,12 @@
|
|
<dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.boot</groupId>
|
|
<groupId>org.springframework.boot</groupId>
|
|
<artifactId>spring-boot-starter-web</artifactId>
|
|
<artifactId>spring-boot-starter-web</artifactId>
|
|
-<!-- <exclusions>-->
|
|
|
|
-<!-- <exclusion>-->
|
|
|
|
-<!-- <groupId>org.springframework.boot</groupId>-->
|
|
|
|
-<!-- <artifactId>spring-boot-starter-tomcat</artifactId>-->
|
|
|
|
-<!-- </exclusion>-->
|
|
|
|
-<!-- </exclusions>-->
|
|
|
|
|
|
+ <exclusions>
|
|
|
|
+ <exclusion>
|
|
|
|
+ <groupId>org.springframework.boot</groupId>
|
|
|
|
+ <artifactId>spring-boot-starter-tomcat</artifactId>
|
|
|
|
+ </exclusion>
|
|
|
|
+ </exclusions>
|
|
</dependency>
|
|
</dependency>
|
|
|
|
|
|
<!--maven打war包配置-->
|
|
<!--maven打war包配置-->
|
|
@@ -62,7 +62,7 @@
|
|
<dependency>
|
|
<dependency>
|
|
<groupId>javax.servlet</groupId>
|
|
<groupId>javax.servlet</groupId>
|
|
<artifactId>javax.servlet-api</artifactId>
|
|
<artifactId>javax.servlet-api</artifactId>
|
|
- <scope>runtime</scope>
|
|
|
|
|
|
+ <scope>provided</scope>
|
|
</dependency>
|
|
</dependency>
|
|
<!--spring web end-->
|
|
<!--spring web end-->
|
|
|
|
|
|
@@ -197,7 +197,15 @@
|
|
<plugin>
|
|
<plugin>
|
|
<groupId>org.springframework.boot</groupId>
|
|
<groupId>org.springframework.boot</groupId>
|
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
- <version>3.0.2</version>
|
|
|
|
|
|
+ <version>2.7.2</version>
|
|
|
|
+ </plugin>
|
|
|
|
+ <plugin>
|
|
|
|
+ <groupId>org.apache.maven.plugins</groupId>
|
|
|
|
+ <artifactId>maven-war-plugin</artifactId>
|
|
|
|
+ <version>3.3.1</version>
|
|
|
|
+ <configuration>
|
|
|
|
+ <failOnMissingWebXml>false</failOnMissingWebXml>
|
|
|
|
+ </configuration>
|
|
</plugin>
|
|
</plugin>
|
|
<plugin>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<groupId>org.apache.maven.plugins</groupId>
|