diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/pom.xml index b08c4372bee..79e99e6b2f9 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/pom.xml +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/pom.xml @@ -28,6 +28,16 @@ org.springframework.boot spring-boot-starter-actuator + + + javax.cache + cache-api + + + org.ehcache + ehcache + runtime + org.springframework.boot @@ -43,85 +53,4 @@ - - - caffeine - - - com.github.ben-manes.caffeine - caffeine - - - - - couchbase - - - com.couchbase.client - java-client - - - com.couchbase.client - couchbase-spring-cache - - - - - ehcache2 - - - net.sf.ehcache - ehcache - - - - - ehcache - - - javax.cache - cache-api - - - org.ehcache - ehcache - - - - - hazelcast - - - com.hazelcast - hazelcast - - - com.hazelcast - hazelcast-spring - - - - - infinispan - - - org.infinispan - infinispan-spring5-embedded - - - org.infinispan - infinispan-jcache - - - - - redis - - - org.springframework.boot - spring-boot-starter-data-redis - - - - diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/application.properties index 7375d2ab197..709b891651c 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/application.properties +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/application.properties @@ -1,18 +1,3 @@ management.endpoints.web.exposure.include=* -# -# Infinispan configuration file location. -# -spring.cache.infinispan.config=classpath:infinispan.xml - - -# -# JCache configuration (example with ehcache 3). -# -#spring.cache.jcache.config=classpath:ehcache3.xml - - -# -# Caffeine configuration -# -spring.cache.caffeine.spec=maximumSize=200,expireAfterAccess=600s +spring.cache.jcache.config=classpath:ehcache3.xml diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/ehcache.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/ehcache.xml deleted file mode 100644 index 4b6e3692fd2..00000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/ehcache.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/hazelcast.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/hazelcast.xml deleted file mode 100644 index 7f25b7d0c9e..00000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/hazelcast.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 600 - 200 - - - - - - true - true - - - - - - - - - - diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/infinispan.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/infinispan.xml deleted file mode 100644 index b4f00787df0..00000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/infinispan.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - -