Merge branch '2.6.x' into 2.7.x
This commit is contained in:
commit
a7f06e0989
|
@ -37,6 +37,9 @@ 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("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…
Reference in New Issue