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 pull request #16503 from vpavic 

* pr/16503:
  Upgrade to Hazelcast 3.12
pull/16527/head
Stephane Nicoll 7 years ago
parent
61f9816361 bbaa98175f
commit
5f681dfb69
10 changed files with 10 additions and 10 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. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-hazelcast.xml
  2. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/hazelcast.xml
  3. 2
      spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-hazelcast.xml
  4. 2
      spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast.xml
  5. 2
      spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.xml
  6. 2
      spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.xml
  7. 2
      spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml
  8. 2
      spring-boot-project/spring-boot-dependencies/pom.xml
  9. 2
      spring-boot-samples/spring-boot-sample-cache/src/main/resources/hazelcast.xml
  10. 2
      spring-boot-samples/spring-boot-sample-session/src/main/resources/hazelcast.xml

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

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.11.xsd"
<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"/>

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

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
<hazelcast
xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.11.xsd"
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="defaultCache" />

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

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.11.xsd"
<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"/>

2
spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast.xml
Unescape View File

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
<hazelcast
xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.11.xsd"
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="defaultCache" />

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.xml
Unescape View File

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
<hazelcast
xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.11.xsd"
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">
<instance-name>default-instance</instance-name>
<map name="defaultCache" />

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.xml
Unescape View File

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<hazelcast-client xmlns="http://www.hazelcast.com/schema/client-config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.hazelcast.com/schema/client-config hazelcast-client-config-3.11.xsd">
xsi:schemaLocation="http://www.hazelcast.com/schema/client-config hazelcast-client-config-3.12.xsd">
</hazelcast-client>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.11.xsd"
<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">

2
spring-boot-project/spring-boot-dependencies/pom.xml
Unescape View File

@ -67,7 +67,7 @@ @@ -67,7 +67,7 @@
<gson.version>2.8.5</gson.version>
<h2.version>1.4.199</h2.version>
<hamcrest.version>1.3</hamcrest.version>
<hazelcast.version>3.11.2</hazelcast.version>
<hazelcast.version>3.12</hazelcast.version>
<hazelcast-hibernate5.version>1.3.2</hazelcast-hibernate5.version>
<hibernate.version>5.4.2.Final</hibernate.version>
<hibernate-validator.version>6.0.16.Final</hibernate-validator.version>

2
spring-boot-samples/spring-boot-sample-cache/src/main/resources/hazelcast.xml vendored
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.11.xsd"
<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">

2
spring-boot-samples/spring-boot-sample-session/src/main/resources/hazelcast.xml
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.11.xsd"
<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">

Write Preview
Loading…
Cancel
Save