Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix EhCache smoke test when building with a toolchain

Browse Source
This commit is contained in:
Andy Wilkinson 2022-08-09 21:58:35 +01:00
parent f287acd1ff
commit f4ddd3b597
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/build.gradle
View File

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