Merge branch '2.6.x' into 2.7.x

3 years ago · a7f06e0989
1 changed files with 3 additions and 0 deletions
--- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/build.gradle
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/build.gradle
@ -37,6 +37,9 @@ dependencies {
				@@ -37,6 +37,9 @@ dependencies {
 	ehcache(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies")))
 	ehcache("javax.cache:cache-api")
 	ehcache("org.ehcache:ehcache")
+	if (JavaVersion.current().java11Compatible) {
+		ehcache("org.glassfish.jaxb:jaxb-runtime")
+	}
 	ehcache2(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies")))
 	ehcache2("net.sf.ehcache:ehcache")