Merge branch '2.1.x'

Closes gh-18355
This commit is contained in:
Madhura Bhave 2019-09-25 09:45:23 -07:00
commit 8088e79f48

View File

@ -8,7 +8,6 @@
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
<artifactId>spring-boot-smoke-test-jersey</artifactId> <artifactId>spring-boot-smoke-test-jersey</artifactId>
<packaging>war</packaging>
<name>Spring Boot Jersey Smoke Test</name> <name>Spring Boot Jersey Smoke Test</name>
<description>Spring Boot Jersey Smoke Test</description> <description>Spring Boot Jersey Smoke Test</description>
<properties> <properties>
@ -24,11 +23,9 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId> <artifactId>spring-boot-starter-actuator</artifactId>
</dependency> </dependency>
<!-- Provided -->
<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>
</dependency> </dependency>
<!-- Test --> <!-- Test -->
<dependency> <dependency>