Fix EhCache smoke test when building with a toolchain

pull/32501/head
Andy Wilkinson 2 years ago
parent f287acd1ff
commit f4ddd3b597

@ -21,6 +21,10 @@ configurations {
infinispan infinispan
} }
def javaVersion() {
project.extensions.java.toolchain.languageVersion.map({ it.asInt() }).getOrElse(JavaVersion.current().majorVersion)
}
dependencies { dependencies {
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-cache")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-cache"))
@ -37,9 +41,7 @@ dependencies {
ehcache(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies"))) ehcache(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies")))
ehcache("javax.cache:cache-api") ehcache("javax.cache:cache-api")
ehcache("org.ehcache:ehcache") ehcache("org.ehcache:ehcache")
if (JavaVersion.current().java11Compatible) { ehcache(provider({ (javaVersion() >= 11) ? "org.glassfish.jaxb:jaxb-runtime" : null }))
ehcache("org.glassfish.jaxb:jaxb-runtime")
}
ehcache2(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies"))) ehcache2(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies")))
ehcache2("net.sf.ehcache:ehcache") ehcache2("net.sf.ehcache:ehcache")

Loading…
Cancel
Save