From e8b5374d8776f040c9133ae341b17e780b1e2323 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Fri, 8 Jul 2016 16:28:24 +0200
Subject: [PATCH] Require EhCache 2.10+

Issue: SPR-13794
---
 .../springframework/cache/ehcache/EhCacheFactoryBean.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java b/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java
index f984cdea04..5ae259297f 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java
@@ -50,7 +50,7 @@ import org.springframework.beans.factory.InitializingBean;
  * <p>Note: If the named Cache instance is found, the properties will be ignored and the
  * Cache instance will be retrieved from the CacheManager.
  *
- * <p>Note: As of Spring 4.1, Spring's EhCache support requires EhCache 2.5 or higher.
+ * <p>Note: As of Spring 5.0, Spring's EhCache support requires EhCache 2.10 or higher.
  *
  * @author Juergen Hoeller
  * @author Dmitriy Kopylenko
@@ -84,10 +84,9 @@ public class EhCacheFactoryBean extends CacheConfiguration implements FactoryBea
 	private Ehcache cache;
 
 
-	@SuppressWarnings("deprecation")
 	public EhCacheFactoryBean() {
 		setMaxEntriesLocalHeap(10000);
-		setMaxElementsOnDisk(10000000);
+		setMaxEntriesLocalDisk(10000000);
 		setTimeToLiveSeconds(120);
 		setTimeToIdleSeconds(120);
 	}