Merge branch '2.2.x'

Closes gh-19843

Author: snicoll

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

@@ -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'