From 0a0766e4a8edc107d3b77e0428ed1008afaffd52 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Mon, 18 Jan 2021 12:43:34 +0100 Subject: [PATCH] Upgrade Hazelcast 4 to 4.1.1 Closes gh-1761 --- spring-session-hazelcast/hazelcast4/hazelcast4.gradle | 4 ++-- .../ClientServerHazelcast4IndexedSessionRepositoryITests.java | 2 +- .../src/integration-test/resources/hazelcast-server.xml | 2 +- .../spring-session-sample-boot-hazelcast4.gradle | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-session-hazelcast/hazelcast4/hazelcast4.gradle b/spring-session-hazelcast/hazelcast4/hazelcast4.gradle index 8a84e71b..b8c1dc8f 100644 --- a/spring-session-hazelcast/hazelcast4/hazelcast4.gradle +++ b/spring-session-hazelcast/hazelcast4/hazelcast4.gradle @@ -31,7 +31,7 @@ artifacts { dependencies { compile project(':spring-session-core') - optional "com.hazelcast:hazelcast:4.0.3" + optional "com.hazelcast:hazelcast:4.1.1" compile "org.springframework:spring-context" compile "javax.annotation:javax.annotation-api" @@ -42,7 +42,7 @@ dependencies { testRuntime "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "org.testcontainers:testcontainers" - integrationTestCompile "com.hazelcast:hazelcast:4.0.3" + integrationTestCompile "com.hazelcast:hazelcast:4.1.1" integrationTestCompile project(":spring-session-hazelcast") } diff --git a/spring-session-hazelcast/hazelcast4/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcast4IndexedSessionRepositoryITests.java b/spring-session-hazelcast/hazelcast4/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcast4IndexedSessionRepositoryITests.java index 7c031cfb..ebf87d5a 100644 --- a/spring-session-hazelcast/hazelcast4/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcast4IndexedSessionRepositoryITests.java +++ b/spring-session-hazelcast/hazelcast4/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcast4IndexedSessionRepositoryITests.java @@ -45,7 +45,7 @@ import org.springframework.test.context.web.WebAppConfiguration; @WebAppConfiguration class ClientServerHazelcast4IndexedSessionRepositoryITests extends AbstractHazelcast4IndexedSessionRepositoryITests { - private static GenericContainer container = new GenericContainer<>("hazelcast/hazelcast:4.0.2") + private static GenericContainer container = new GenericContainer<>("hazelcast/hazelcast:4.1.1") .withExposedPorts(5701).withCopyFileToContainer(MountableFile.forClasspathResource("/hazelcast-server.xml"), "/opt/hazelcast/hazelcast.xml"); diff --git a/spring-session-hazelcast/hazelcast4/src/integration-test/resources/hazelcast-server.xml b/spring-session-hazelcast/hazelcast4/src/integration-test/resources/hazelcast-server.xml index cf29846c..3362476b 100644 --- a/spring-session-hazelcast/hazelcast4/src/integration-test/resources/hazelcast-server.xml +++ b/spring-session-hazelcast/hazelcast4/src/integration-test/resources/hazelcast-server.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://www.hazelcast.com/schema/config https://www.hazelcast.com/schema/config/hazelcast-config-4.1.xsd"> diff --git a/spring-session-samples/spring-session-sample-boot-hazelcast4/spring-session-sample-boot-hazelcast4.gradle b/spring-session-samples/spring-session-sample-boot-hazelcast4/spring-session-sample-boot-hazelcast4.gradle index 6cb05959..761a313b 100644 --- a/spring-session-samples/spring-session-sample-boot-hazelcast4/spring-session-sample-boot-hazelcast4.gradle +++ b/spring-session-samples/spring-session-sample-boot-hazelcast4/spring-session-sample-boot-hazelcast4.gradle @@ -6,7 +6,7 @@ dependencies { compile "org.springframework.boot:spring-boot-starter-web" compile "org.springframework.boot:spring-boot-starter-thymeleaf" compile "org.springframework.boot:spring-boot-starter-security" - compile "com.hazelcast:hazelcast:4.0.3" + compile "com.hazelcast:hazelcast:4.1.1" compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" compile "org.webjars:bootstrap" compile "org.webjars:html5shiv"