Merge branch '3.0.x'

Author: philwebb

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/build.gradle

@@ -32,11 +32,3 @@ dependencies {
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-jetty"))
 }
-
-eclipse {
-	wtp {
-		facet {
-			facet name: 'jst.web', version: '5.0'
-		}
-	}
-}

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/build.gradle

@@ -20,11 +20,3 @@ dependencies {
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
 }
-
-eclipse {
-	wtp {
-		facet {
-			facet name: 'jst.web', version: '5.0'
-		}
-	}
-}

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/build.gradle

@@ -21,11 +21,3 @@ dependencies {
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
 	testImplementation("org.apache.httpcomponents.client5:httpclient5")
 }
-
-eclipse {
-	wtp {
-		facet {
-			facet name: 'jst.web', version: '5.0'
-		}
-	}
-}

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/build.gradle

@@ -20,11 +20,3 @@ dependencies {
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
 }
-
-eclipse {
-	wtp {
-		facet {
-			facet name: 'jst.web', version: '5.0'
-		}
-	}
-}