Skip to content

Commit 979598e

Browse files
committed
Re-enable Hazelcast support
Closes gh-1958
1 parent 2113c32 commit 979598e

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

settings.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ include 'spring-session-core'
1616
include 'spring-session-data-mongodb'
1717
include 'spring-session-data-redis'
1818
include 'spring-session-docs'
19-
//include 'spring-session-hazelcast'
19+
include 'spring-session-hazelcast'
2020
include 'spring-session-jdbc'
2121

2222
include 'spring-session-sample-javaconfig-custom-cookie'
@@ -25,6 +25,8 @@ include 'spring-session-sample-javaconfig-jdbc'
2525
project(':spring-session-sample-javaconfig-jdbc').projectDir = file('spring-session-samples/spring-session-sample-javaconfig-jdbc')
2626
include 'spring-session-sample-javaconfig-redis'
2727
project(':spring-session-sample-javaconfig-redis').projectDir = file('spring-session-samples/spring-session-sample-javaconfig-redis')
28+
include 'spring-session-sample-misc-hazelcast'
29+
project(':spring-session-sample-misc-hazelcast').projectDir = file('spring-session-samples/spring-session-sample-misc-hazelcast')
2830
include 'spring-session-sample-xml-redis'
2931
project(':spring-session-sample-xml-redis').projectDir = file('spring-session-samples/spring-session-sample-xml-redis')
3032
include 'spring-session-sample-xml-jdbc'

spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcastIndexedSessionRepositoryITests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.hazelcast.core.HazelcastInstance;
2222
import org.junit.jupiter.api.AfterAll;
2323
import org.junit.jupiter.api.BeforeAll;
24+
import org.junit.jupiter.api.Disabled;
2425
import org.junit.jupiter.api.extension.ExtendWith;
2526
import org.testcontainers.containers.GenericContainer;
2627
import org.testcontainers.utility.MountableFile;
@@ -44,6 +45,7 @@
4445
@ExtendWith(SpringExtension.class)
4546
@ContextConfiguration
4647
@WebAppConfiguration
48+
@Disabled("Re-enable when Hazelcast image uses JDK 17")
4749
class ClientServerHazelcastIndexedSessionRepositoryITests extends AbstractHazelcastIndexedSessionRepositoryITests {
4850

4951
private static GenericContainer container = new GenericContainer<>("hazelcast/hazelcast:5.0").withExposedPorts(5701)

spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ plugins {
55

66
dependencies {
77
implementation project(':spring-session-hazelcast')
8-
implementation project(':hazelcast4')
98
implementation "org.springframework:spring-web"
109
implementation "org.springframework.security:spring-security-config"
1110
implementation "org.springframework.security:spring-security-web"

0 commit comments

Comments
 (0)