Merge pull request #18320 from panos-kakos/JAVA-43810

[JAVA-43810]Fixed integration

Author: ulisseslima

spring-boot-modules/spring-boot-caching-2/src/main/resources/ehcache.xml

@@ -0,0 +1,21 @@
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="http://www.ehcache.org/v3"
+        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="books">
+        <key-type>java.lang.String</key-type>
+        <value-type>com.baeldung.springdatacaching.model.Book</value-type>
+        <expiry>
+            <ttl unit="seconds">30</ttl>
+        </expiry>
+
+        <resources>
+            <heap unit="entries">2</heap>
+            <offheap unit="MB">10</offheap>
+        </resources>
+    </cache>
+
+</config>

spring-boot-modules/spring-boot-caching-2/src/test/resources/application.properties

@@ -11,4 +11,7 @@ spring.jpa.show-sql=false
 # Connection details
 #spring.redis.host=localhost
 #spring.redis.port=6379
-server.port=8000
+server.port=8000
+
+#ehcache
+spring.cache.jcache.config=classpath:ehcache.xml

spring-boot-modules/spring-boot-caching/src/main/resources/ehcache.xml

@@ -27,28 +27,5 @@
             <offheap unit="MB">10</offheap>
         </resources>
     </cache>
-    
-    <cache alias="books">
-        <key-type>java.lang.String</key-type>
-        <value-type>com.baeldung.springdatacaching.model.Book</value-type>
-        <expiry>
-            <ttl unit="seconds">30</ttl>
-        </expiry>
-        
-        <listeners>
-            <listener>
-                <class>com.baeldung.cachetest.config.CacheEventLogger</class>
-                <event-firing-mode>ASYNCHRONOUS</event-firing-mode>
-                <event-ordering-mode>UNORDERED</event-ordering-mode>
-                <events-to-fire-on>CREATED</events-to-fire-on>
-                <events-to-fire-on>EXPIRED</events-to-fire-on>
-            </listener>
-        </listeners>
-        
-        <resources>
-            <heap unit="entries">2</heap>
-            <offheap unit="MB">10</offheap>
-        </resources>
-    </cache>
 
 </config>