Merge branch '2.2.x'

Closes gh-19843

spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

@@ -83,7 +83,6 @@ dependencies {
 	optional 'org.hibernate.validator:hibernate-validator'
 	optional 'org.influxdb:influxdb-java'
 	optional 'org.jolokia:jolokia-core'
-	optional 'org.infinispan:infinispan-spring4-embedded'
 	optional 'org.liquibase:liquibase-core'
 	optional 'org.mongodb:mongodb-driver-async'
 	optional 'org.mongodb:mongodb-driver-reactivestreams'

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-ehcache.xml

-<ehcache>
-	<diskStore path="java.io.tmpdir"/>
-	<defaultCache/>
-	<cache name="books" maxEntriesLocalHeap="50"/>
-	<cache name="players" maxEntriesLocalHeap="50"/>
-</ehcache>

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-hazelcast.xml

-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.12.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>

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-infinispan.xml

-<?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>

spring-boot-project/spring-boot-actuator/build.gradle

@@ -15,6 +15,7 @@ dependencies {
 
 	optional platform(project(':spring-boot-project:spring-boot-dependencies'))
 	optional 'com.fasterxml.jackson.core:jackson-databind'
+	optional 'com.github.ben-manes.caffeine:caffeine'
 	optional 'com.hazelcast:hazelcast'
 	optional 'com.hazelcast:hazelcast-spring'
 	optional 'com.sun.mail:jakarta.mail'
@@ -40,7 +41,6 @@ dependencies {
 	optional 'org.glassfish.jersey.core:jersey-server'
 	optional 'org.glassfish.jersey.containers:jersey-container-servlet-core'
 	optional 'org.hibernate.validator:hibernate-validator'
-	optional 'org.infinispan:infinispan-spring4-embedded'
 	optional 'org.influxdb:influxdb-java'
 	optional 'org.liquibase:liquibase-core'
 	optional 'org.mongodb:mongodb-driver-async'

spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-ehcache.xml

-<ehcache>
-	<diskStore path="java.io.tmpdir"/>
-	<defaultCache/>
-	<cache name="books" maxEntriesLocalHeap="50"/>
-	<cache name="players" maxEntriesLocalHeap="50"/>
-</ehcache>

spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-hazelcast.xml

-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.12.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>

spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-infinispan.xml

-<?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>