From 0cfcbeb40e075da9baa6bb85c15ceceacb5695c4 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Tue, 19 Apr 2016 13:58:24 +0200
Subject: [PATCH] Add dependency management for Ehcache 3

Closes gh-5725
---
 spring-boot-dependencies/pom.xml                     |  6 ++++++
 spring-boot-samples/spring-boot-sample-cache/pom.xml |  6 ++++++
 .../src/main/resources/ehcache3.xml                  | 12 ++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 spring-boot-samples/spring-boot-sample-cache/src/main/resources/ehcache3.xml

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index e4bf7284c32..d4775b69c50 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -69,6 +69,7 @@
 		<dom4j.version>1.6.1</dom4j.version>
 		<dropwizard-metrics.version>3.1.2</dropwizard-metrics.version>
 		<ehcache.version>2.10.1</ehcache.version>
+		<ehcache3.version>3.0.0</ehcache3.version>
 		<embedded-mongo.version>1.50.2</embedded-mongo.version>
 		<flyway.version>3.2.1</flyway.version>
 		<freemarker.version>2.3.23</freemarker.version>
@@ -1564,6 +1565,11 @@
 				<artifactId>websocket-server</artifactId>
 				<version>${jetty.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.ehcache</groupId>
+				<artifactId>ehcache</artifactId>
+				<version>${ehcache3.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.elasticsearch</groupId>
 				<artifactId>elasticsearch</artifactId>
diff --git a/spring-boot-samples/spring-boot-sample-cache/pom.xml b/spring-boot-samples/spring-boot-sample-cache/pom.xml
index 631787da88c..a2dd9a0177f 100644
--- a/spring-boot-samples/spring-boot-sample-cache/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-cache/pom.xml
@@ -49,6 +49,12 @@
 		</dependency>
 		-->
 		<!--
+		<dependency>
+			<groupId>org.ehcache</groupId>
+			<artifactId>ehcache</artifactId>
+		</dependency>
+		-->
+		<!--
 		<dependency>
 			<groupId>com.hazelcast</groupId>
 			<artifactId>hazelcast</artifactId>
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
new file mode 100644
index 00000000000..7f813250090
--- /dev/null
+++ b/spring-boot-samples/spring-boot-sample-cache/src/main/resources/ehcache3.xml
@@ -0,0 +1,12 @@
+<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">
+
+	<cache alias="countries">
+		<expiry>
+			<ttl unit="seconds">600</ttl>
+		</expiry>
+		<heap unit="entries">200</heap>
+	</cache>
+
+</config>
\ No newline at end of file