GitHub-Spring
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch '2.1.x' into 2.2.x 

Closes gh-19842
pull/19959/head
Stephane Nicoll 6 years ago
parent
b6bed9fccd 34c263a828
commit
84324c438b
8 changed files with 5 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml
  2. 6
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-ehcache.xml
  3. 12
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-hazelcast.xml
  4. 8
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-infinispan.xml
  5. 5
      spring-boot-project/spring-boot-actuator/pom.xml
  6. 6
      spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-ehcache.xml
  7. 12
      spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-hazelcast.xml
  8. 8
      spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-infinispan.xml

5
spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml
Unescape View File

@ -347,11 +347,6 @@ @@ -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>

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-ehcache.xml vendored
Unescape View File

@ -1,6 +0,0 @@ @@ -1,6 +0,0 @@
<ehcache>
<diskStore path="java.io.tmpdir"/>
<defaultCache/>
<cache name="books" maxEntriesLocalHeap="50"/>
<cache name="players" maxEntriesLocalHeap="50"/>
</ehcache>

12
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-hazelcast.xml vendored
Unescape View File

@ -1,12 +0,0 @@ @@ -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>

8
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-infinispan.xml vendored
Unescape View File

@ -1,8 +0,0 @@ @@ -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>

5
spring-boot-project/spring-boot-actuator/pom.xml
Unescape View File

@ -36,6 +36,11 @@ @@ -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>

6
spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-ehcache.xml vendored
Unescape View File

@ -1,6 +0,0 @@ @@ -1,6 +0,0 @@
<ehcache>
<diskStore path="java.io.tmpdir"/>
<defaultCache/>
<cache name="books" maxEntriesLocalHeap="50"/>
<cache name="players" maxEntriesLocalHeap="50"/>
</ehcache>

12
spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-hazelcast.xml vendored
Unescape View File

@ -1,12 +0,0 @@ @@ -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>

8
spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-infinispan.xml vendored
Unescape View File

@ -1,8 +0,0 @@ @@ -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>
Write Preview
Loading…
Cancel
Save