From 205b1c1327aef9adf6cc68a7dd572bc8b4889bbc Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Thu, 31 May 2018 23:30:36 +0200 Subject: [PATCH] Upgrade to Hazelcast 3.10.1 Closes gh-13322 --- .../src/test/resources/cache/test-hazelcast.xml | 2 +- .../src/test/resources/hazelcast.xml | 2 +- .../src/test/resources/cache/test-hazelcast.xml | 2 +- .../spring-boot-actuator/src/test/resources/hazelcast.xml | 2 +- .../src/test/resources/hazelcast.xml | 2 +- .../autoconfigure/hazelcast/hazelcast-client-specific.xml | 2 +- .../boot/autoconfigure/hazelcast/hazelcast-specific.xml | 4 ++-- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- .../spring-boot-sample-cache/src/main/resources/hazelcast.xml | 2 +- .../src/main/resources/hazelcast.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git 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 index 1684f41d085..94a0d679d8e 100644 --- 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,4 +1,4 @@ - diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/hazelcast.xml b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/hazelcast.xml index c60e05846e4..9aa7a45632a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/hazelcast.xml +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/hazelcast.xml @@ -1,5 +1,5 @@ diff --git 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 index 1684f41d085..94a0d679d8e 100644 --- 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,4 +1,4 @@ - diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast.xml b/spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast.xml index c60e05846e4..9aa7a45632a 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast.xml +++ b/spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast.xml @@ -1,5 +1,5 @@ diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.xml index 7a060b66033..92aa5e76c63 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.xml +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.xml @@ -1,5 +1,5 @@ default-instance diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.xml index e5596bf2206..53281f3ed33 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.xml +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.hazelcast.com/schema/client-config hazelcast-client-config-3.10.xsd"> diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml index 42f6f16e739..308a412d0f5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml @@ -1,4 +1,4 @@ - @@ -16,4 +16,4 @@ - \ No newline at end of file + diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index d167f2b88dc..016683de091 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -65,7 +65,7 @@ 2.8.5 1.4.197 1.3 - 3.9.4 + 3.10.1 1.2.3 5.2.17.Final 1.0.2.Final diff --git a/spring-boot-samples/spring-boot-sample-cache/src/main/resources/hazelcast.xml b/spring-boot-samples/spring-boot-sample-cache/src/main/resources/hazelcast.xml index 2711cdbd8c1..1cbc30ee961 100644 --- a/spring-boot-samples/spring-boot-sample-cache/src/main/resources/hazelcast.xml +++ b/spring-boot-samples/spring-boot-sample-cache/src/main/resources/hazelcast.xml @@ -1,4 +1,4 @@ - diff --git a/spring-boot-samples/spring-boot-sample-session/src/main/resources/hazelcast.xml b/spring-boot-samples/spring-boot-sample-session/src/main/resources/hazelcast.xml index f2f41b3061e..8159481745a 100644 --- a/spring-boot-samples/spring-boot-sample-session/src/main/resources/hazelcast.xml +++ b/spring-boot-samples/spring-boot-sample-session/src/main/resources/hazelcast.xml @@ -1,4 +1,4 @@ -