From 9e60340c0e4b10633fe50a740f051ecbdc114087 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Tue, 10 May 2016 07:33:39 +0200
Subject: [PATCH] Upgrade to EhCache 3.0.1

Closes gh-5898
---
 spring-boot-dependencies/pom.xml                          | 2 +-
 .../src/main/resources/application.properties             | 4 ++--
 .../src/main/resources/ehcache3.xml                       | 8 +++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index ffcdec0254..9b351e38c6 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -69,7 +69,7 @@
 		<dom4j.version>1.6.1</dom4j.version>
 		<dropwizard-metrics.version>3.1.2</dropwizard-metrics.version>
 		<ehcache.version>2.10.2</ehcache.version>
-		<ehcache3.version>3.0.0</ehcache3.version>
+		<ehcache3.version>3.0.1</ehcache3.version>
 		<embedded-mongo.version>1.50.3</embedded-mongo.version>
 		<flyway.version>3.2.1</flyway.version>
 		<freemarker.version>2.3.23</freemarker.version>
diff --git a/spring-boot-samples/spring-boot-sample-cache/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-cache/src/main/resources/application.properties
index 80048ca64c..d913ffc2cc 100644
--- a/spring-boot-samples/spring-boot-sample-cache/src/main/resources/application.properties
+++ b/spring-boot-samples/spring-boot-sample-cache/src/main/resources/application.properties
@@ -5,9 +5,9 @@
 
 
 #
-# JCache configuration (example with hazelcast).
+# JCache configuration (example with ehcache 3).
 #
-#spring.cache.jcache.config=hazelcast.xml
+#spring.cache.jcache.config=ehcache3.xml
 
 
 #
diff --git a/spring-boot-samples/spring-boot-sample-cache/src/main/resources/ehcache3.xml b/spring-boot-samples/spring-boot-sample-cache/src/main/resources/ehcache3.xml
index 7f81325009..df1a92a60d 100644
--- a/spring-boot-samples/spring-boot-sample-cache/src/main/resources/ehcache3.xml
+++ b/spring-boot-samples/spring-boot-sample-cache/src/main/resources/ehcache3.xml
@@ -1,12 +1,14 @@
 <config xmlns='http://www.ehcache.org/v3'
-		xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
-		xsi:schemaLocation="http://www.ehcache.org/v3 http://www.ehcache.org/schema/ehcache-core-3.0.xsd">
-
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:jsr107="http://www.ehcache.org/v3/jsr107"
+		xsi:schemaLocation="http://www.ehcache.org/v3 http://www.ehcache.org/schema/ehcache-core-3.0.xsd
+							http://www.ehcache.org/v3/jsr107 http://www.ehcache.org/schema/ehcache-107-ext-3.0.xsd">
 	<cache alias="countries">
 		<expiry>
 			<ttl unit="seconds">600</ttl>
 		</expiry>
 		<heap unit="entries">200</heap>
+		<jsr107:mbeans enable-statistics="true"/>
 	</cache>
 
 </config>
\ No newline at end of file