From 34c263a8281a8c8c607533c020332da5f6339f24 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Tue, 21 Jan 2020 14:20:28 +0100
Subject: [PATCH] Polish actuator dependencies and test resources

This commit removes references of cache infra following the move to
Micrometer. We no longer ships an infinispan specific binder so the
dependency has been removed as well.

Closes gh-19838
---
 .../spring-boot-actuator-autoconfigure/pom.xml       |  5 -----
 .../src/test/resources/cache/test-ehcache.xml        |  6 ------
 .../src/test/resources/cache/test-hazelcast.xml      | 12 ------------
 .../src/test/resources/cache/test-infinispan.xml     |  8 --------
 spring-boot-project/spring-boot-actuator/pom.xml     |  5 +++++
 .../src/test/resources/cache/test-ehcache.xml        |  6 ------
 .../src/test/resources/cache/test-hazelcast.xml      | 12 ------------
 .../src/test/resources/cache/test-infinispan.xml     |  8 --------
 8 files changed, 5 insertions(+), 57 deletions(-)
 delete mode 100644 spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-ehcache.xml
 delete mode 100644 spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-hazelcast.xml
 delete mode 100644 spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-infinispan.xml
 delete mode 100644 spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-ehcache.xml
 delete mode 100644 spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-hazelcast.xml
 delete mode 100644 spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-infinispan.xml

diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml b/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml
index 7bfc81ed4bc..b079e67c47e 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml
@@ -309,11 +309,6 @@
 			<artifactId>jolokia-core</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.infinispan</groupId>
-			<artifactId>infinispan-spring4-embedded</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.liquibase</groupId>
 			<artifactId>liquibase-core</artifactId>
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-ehcache.xml b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-ehcache.xml
deleted file mode 100644
index cdee1d0503e..00000000000
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-ehcache.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<ehcache>
-	<diskStore path="java.io.tmpdir"/>
-	<defaultCache/>
-	<cache name="books" maxEntriesLocalHeap="50"/>
-	<cache name="players" maxEntriesLocalHeap="50"/>
-</ehcache>
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-hazelcast.xml b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-hazelcast.xml
deleted file mode 100644
index f520a20d14a..00000000000
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-hazelcast.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.11.xsd"
-		xmlns="http://www.hazelcast.com/schema/config"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<map name="books"/>
-	<map name="players"/>
-	<network>
-		<join>
-			<tcp-ip enabled="false"/>
-			<multicast enabled="false"/>
-		</join>
-	</network>
-</hazelcast>
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-infinispan.xml b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-infinispan.xml
deleted file mode 100644
index 741fb6292b7..00000000000
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-infinispan.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<infinispan>
-	<cache-container default-cache="default">
-		<local-cache name="default"/>
-		<local-cache name="books" statistics="true"/>
-		<local-cache name="players" statistics="true"/>
-	</cache-container>
-</infinispan>
diff --git a/spring-boot-project/spring-boot-actuator/pom.xml b/spring-boot-project/spring-boot-actuator/pom.xml
index c489f527d3b..9fca2d7fbc4 100644
--- a/spring-boot-project/spring-boot-actuator/pom.xml
+++ b/spring-boot-project/spring-boot-actuator/pom.xml
@@ -32,6 +32,11 @@
 			<artifactId>jackson-databind</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>com.github.ben-manes.caffeine</groupId>
+			<artifactId>caffeine</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>com.hazelcast</groupId>
 			<artifactId>hazelcast</artifactId>
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-ehcache.xml b/spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-ehcache.xml
deleted file mode 100644
index cdee1d0503e..00000000000
--- a/spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-ehcache.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<ehcache>
-	<diskStore path="java.io.tmpdir"/>
-	<defaultCache/>
-	<cache name="books" maxEntriesLocalHeap="50"/>
-	<cache name="players" maxEntriesLocalHeap="50"/>
-</ehcache>
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-hazelcast.xml b/spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-hazelcast.xml
deleted file mode 100644
index f520a20d14a..00000000000
--- a/spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-hazelcast.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.11.xsd"
-		xmlns="http://www.hazelcast.com/schema/config"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<map name="books"/>
-	<map name="players"/>
-	<network>
-		<join>
-			<tcp-ip enabled="false"/>
-			<multicast enabled="false"/>
-		</join>
-	</network>
-</hazelcast>
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-infinispan.xml b/spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-infinispan.xml
deleted file mode 100644
index 741fb6292b7..00000000000
--- a/spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-infinispan.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<infinispan>
-	<cache-container default-cache="default">
-		<local-cache name="default"/>
-		<local-cache name="books" statistics="true"/>
-		<local-cache name="players" statistics="true"/>
-	</cache-container>
-</infinispan>