Merge branch '2.1.x' into 2.2.x

Closes gh-19842
6 years ago · 84324c438b
8 changed files with 5 additions and 57 deletions
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml
@ -347,11 +347,6 @@
 			<artifactId>jolokia-core</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.infinispan</groupId>
 			<artifactId>infinispan-spring5-embedded</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.liquibase</groupId>
 			<artifactId>liquibase-core</artifactId>
--- 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
@ -1,6 +0,0 @@
 <ehcache>
 	<diskStore path="java.io.tmpdir"/>
 	<defaultCache/>
 	<cache name="books" maxEntriesLocalHeap="50"/>
 	<cache name="players" maxEntriesLocalHeap="50"/>
 </ehcache>
--- 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
@ -1,12 +0,0 @@
 <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>
--- 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
@ -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>
--- a/spring-boot-project/spring-boot-actuator/pom.xml
+++ b/spring-boot-project/spring-boot-actuator/pom.xml
@ -36,6 +36,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>
--- 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
@ -1,6 +0,0 @@
 <ehcache>
 	<diskStore path="java.io.tmpdir"/>
 	<defaultCache/>
 	<cache name="books" maxEntriesLocalHeap="50"/>
 	<cache name="players" maxEntriesLocalHeap="50"/>
 </ehcache>
--- 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
@ -1,12 +0,0 @@
 <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>
--- 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
@ -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>