Browse Source

Merge pull request #8808 from vpavic:upgrade-hazelcast

* pr/8808:
  Upgrade to Hazelcast 3.8
pull/7469/head
Stephane Nicoll 9 years ago
parent
commit
a2a30cd3c0
  1. 2
      spring-boot-actuator/src/test/resources/cache/test-hazelcast.xml
  2. 2
      spring-boot-actuator/src/test/resources/hazelcast.xml
  3. 2
      spring-boot-autoconfigure/src/test/resources/hazelcast.xml
  4. 2
      spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml
  5. 4
      spring-boot-dependencies/pom.xml
  6. 2
      spring-boot-samples/spring-boot-sample-cache/src/main/resources/hazelcast.xml

2
spring-boot-actuator/src/test/resources/cache/test-hazelcast.xml vendored

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.7.xsd"
<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.8.xsd"
xmlns="http://www.hazelcast.com/schema/config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

2
spring-boot-actuator/src/test/resources/hazelcast.xml

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
<hazelcast
xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.7.xsd"
xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.8.xsd"
xmlns="http://www.hazelcast.com/schema/config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

2
spring-boot-autoconfigure/src/test/resources/hazelcast.xml

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
<hazelcast
xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.7.xsd"
xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.8.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-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.7.xsd"
<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.8.xsd"
xmlns="http://www.hazelcast.com/schema/config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

4
spring-boot-dependencies/pom.xml

@ -82,8 +82,8 @@ @@ -82,8 +82,8 @@
<gson.version>2.8.0</gson.version>
<h2.version>1.4.194</h2.version>
<hamcrest.version>1.3</hamcrest.version>
<hazelcast.version>3.7.6</hazelcast.version>
<hazelcast-hibernate5.version>1.1.3</hazelcast-hibernate5.version>
<hazelcast.version>3.8</hazelcast.version>
<hazelcast-hibernate5.version>1.2</hazelcast-hibernate5.version>
<hibernate.version>5.2.9.Final</hibernate.version>
<hibernate-validator.version>5.4.1.Final</hibernate-validator.version>
<hikaricp.version>2.5.1</hikaricp.version>

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

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.7.xsd"
<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.8.xsd"
xmlns="http://www.hazelcast.com/schema/config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

Loading…
Cancel
Save