From 7fa39c88074abdd2c8fea7af2631b2e3e209f7c7 Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Thu, 14 Oct 2021 14:50:39 -0300 Subject: [PATCH] Deprecate EhCache2 support Since EhCache 3 is fully JSR-107 compliant, we should remove EhCache2 support and provide JCache implementations Closes gh-10362 --- .../security/acls/domain/EhCacheBasedAclCache.java | 2 ++ .../security/cas/authentication/EhCacheBasedTicketCache.java | 2 ++ .../security/core/userdetails/cache/EhCacheBasedUserCache.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java b/acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java index 124ec9671d..9ad106d7af 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java @@ -37,7 +37,9 @@ import org.springframework.util.Assert; * {@link PermissionGrantingStrategy} and {@link AclAuthorizationStrategy} instances. * * @author Ben Alex + * @deprecated since 5.6. In favor of JCache based implementations */ +@Deprecated public class EhCacheBasedAclCache implements AclCache { private final Ehcache cache; diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java b/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java index 037b2a3f0f..595c0d23f2 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java @@ -30,7 +30,9 @@ import org.springframework.util.Assert; * EHCACHE. * * @author Ben Alex + * @deprecated since 5.6. In favor of JCache based implementations */ +@Deprecated public class EhCacheBasedTicketCache implements StatelessTicketCache, InitializingBean { private static final Log logger = LogFactory.getLog(EhCacheBasedTicketCache.class); diff --git a/core/src/main/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCache.java b/core/src/main/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCache.java index 201199ffeb..1aba15b218 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCache.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCache.java @@ -32,7 +32,9 @@ import org.springframework.util.Assert; * EHCACHE. * * @author Ben Alex + * @deprecated since 5.6. In favor of JCache based implementations */ +@Deprecated public class EhCacheBasedUserCache implements UserCache, InitializingBean { private static final Log logger = LogFactory.getLog(EhCacheBasedUserCache.class);