Merge branch '2.1.x'

Closes gh-17628
2019-07-24 13:39:45 -07:00
parent 5beb7edfbb bb85612723
commit 9bd1187f40
7 changed files with 136 additions and 3 deletions
--- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/pom.xml
+++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/pom.xml
@@ -45,6 +45,17 @@
 			<version>3.0.0</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-webapp</artifactId>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.servlet</groupId>
+					<artifactId>javax.servlet-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>