Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.x'

Browse Source 
Closes gh-19843
This commit is contained in:
Stephane Nicoll
2020-01-21 14:44:01 +01:00
parent 1e72fa202c 84324c438b
commit 08967bca3e
8 changed files with 1 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
View File

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

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

@@ -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
View File

@@ -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
View File

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

2
spring-boot-project/spring-boot-actuator/build.gradle
View File

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

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

@@ -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
View File

@@ -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
View File

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