From dd4f91523418c31024a6b8b356e1483827f384f1 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 28 Dec 2017 14:08:21 +0100 Subject: [PATCH] Upgrade to JCache 1.1 (and Caffeine 2.6.1) Issue: SPR-13574 --- spring-aspects/spring-aspects.gradle | 2 +- spring-context-support/spring-context-support.gradle | 4 ++-- spring-test/spring-test.gradle | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-aspects/spring-aspects.gradle b/spring-aspects/spring-aspects.gradle index 5afc768acb1..1f0a3e7fc66 100644 --- a/spring-aspects/spring-aspects.gradle +++ b/spring-aspects/spring-aspects.gradle @@ -96,7 +96,7 @@ dependencies { optional(project(":spring-context-support")) // for JavaMail and JSR-107 support optional(project(":spring-orm")) // for JPA exception translation support optional(project(":spring-tx")) // for JPA, @Transactional support - optional("javax.cache:cache-api:1.0.0") // for JCache aspect + optional("javax.cache:cache-api:1.1.0") // for JCache aspect optional("javax.transaction:javax.transaction-api:1.2") // for @javax.transaction.Transactional support testCompile(project(":spring-core")) // for CodeStyleAspect testCompile(project(":spring-test")) diff --git a/spring-context-support/spring-context-support.gradle b/spring-context-support/spring-context-support.gradle index 918c9ab3480..4d3f77ad256 100644 --- a/spring-context-support/spring-context-support.gradle +++ b/spring-context-support/spring-context-support.gradle @@ -8,8 +8,8 @@ dependencies { optional(project(":spring-tx")) // for Quartz support optional("javax.activation:activation:1.1.1") optional("javax.mail:javax.mail-api:1.6.0") - optional("javax.cache:cache-api:1.0.0") - optional("com.github.ben-manes.caffeine:caffeine:2.6.0") + optional("javax.cache:cache-api:1.1.0") + optional("com.github.ben-manes.caffeine:caffeine:2.6.1") optional("net.sf.ehcache:ehcache:2.10.4") optional("org.quartz-scheduler:quartz:2.3.0") optional("org.codehaus.fabric3.api:commonj:1.1.0") diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle index 57ddab9f1c2..1f24005785d 100644 --- a/spring-test/spring-test.gradle +++ b/spring-test/spring-test.gradle @@ -61,7 +61,7 @@ dependencies { optional("io.projectreactor:reactor-test") testCompile(project(":spring-context-support")) testCompile(project(":spring-oxm")) - testCompile("javax.cache:cache-api:1.0.0") + testCompile("javax.cache:cache-api:1.1.0") testCompile("javax.ejb:javax.ejb-api:3.2") testCompile("javax.interceptor:javax.interceptor-api:1.2.1") testCompile("javax.mail:javax.mail-api:1.6.0")