Merge remote-tracking branch 'origin/pr/813'
This commit is contained in:
@@ -15,6 +15,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<metrics.version>3.1.0</metrics.version>
|
<metrics.version>3.1.0</metrics.version>
|
||||||
<chameleon.version>1.2.1-RELEASE</chameleon.version>
|
<chameleon.version>1.2.1-RELEASE</chameleon.version>
|
||||||
|
<tomcat.server.scope>provided</tomcat.server.scope>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
@@ -445,12 +446,12 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-tomcat</artifactId>
|
<artifactId>spring-boot-starter-tomcat</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>${tomcat.server.scope}</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.tomcat.embed</groupId>
|
<groupId>org.apache.tomcat.embed</groupId>
|
||||||
<artifactId>tomcat-embed-jasper</artifactId>
|
<artifactId>tomcat-embed-jasper</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>${tomcat.server.scope}</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- Embedded Jetty -->
|
<!-- Embedded Jetty -->
|
||||||
<dependency>
|
<dependency>
|
||||||
@@ -599,5 +600,11 @@
|
|||||||
<boot.artifact.excludes>spring-boot-starter-tomcat</boot.artifact.excludes>
|
<boot.artifact.excludes>spring-boot-starter-tomcat</boot.artifact.excludes>
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<id>ide-tomcat-embed</id>
|
||||||
|
<properties>
|
||||||
|
<tomcat.server.scope>compile</tomcat.server.scope>
|
||||||
|
</properties>
|
||||||
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
Reference in New Issue
Block a user