diff --git a/settings.gradle b/settings.gradle index 7a150add..6ab0436a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,7 +16,7 @@ include 'spring-session-core' include 'spring-session-data-mongodb' include 'spring-session-data-redis' include 'spring-session-docs' -//include 'spring-session-hazelcast' +include 'spring-session-hazelcast' include 'spring-session-jdbc' include 'spring-session-sample-javaconfig-custom-cookie' @@ -25,6 +25,8 @@ include 'spring-session-sample-javaconfig-jdbc' project(':spring-session-sample-javaconfig-jdbc').projectDir = file('spring-session-samples/spring-session-sample-javaconfig-jdbc') include 'spring-session-sample-javaconfig-redis' project(':spring-session-sample-javaconfig-redis').projectDir = file('spring-session-samples/spring-session-sample-javaconfig-redis') +include 'spring-session-sample-misc-hazelcast' +project(':spring-session-sample-misc-hazelcast').projectDir = file('spring-session-samples/spring-session-sample-misc-hazelcast') include 'spring-session-sample-xml-redis' project(':spring-session-sample-xml-redis').projectDir = file('spring-session-samples/spring-session-sample-xml-redis') include 'spring-session-sample-xml-jdbc' diff --git a/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcastIndexedSessionRepositoryITests.java b/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcastIndexedSessionRepositoryITests.java index b72a87e0..631f2e4a 100644 --- a/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcastIndexedSessionRepositoryITests.java +++ b/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcastIndexedSessionRepositoryITests.java @@ -21,6 +21,7 @@ import com.hazelcast.client.config.ClientConfig; import com.hazelcast.core.HazelcastInstance; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.extension.ExtendWith; import org.testcontainers.containers.GenericContainer; import org.testcontainers.utility.MountableFile; @@ -44,6 +45,7 @@ import org.springframework.test.context.web.WebAppConfiguration; @ExtendWith(SpringExtension.class) @ContextConfiguration @WebAppConfiguration +@Disabled("Re-enable when Hazelcast image uses JDK 17") class ClientServerHazelcastIndexedSessionRepositoryITests extends AbstractHazelcastIndexedSessionRepositoryITests { private static GenericContainer container = new GenericContainer<>("hazelcast/hazelcast:5.0").withExposedPorts(5701) diff --git a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle index fb58acce..178ab6d0 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle @@ -5,7 +5,6 @@ plugins { dependencies { implementation project(':spring-session-hazelcast') - implementation project(':hazelcast4') implementation "org.springframework:spring-web" implementation "org.springframework.security:spring-security-config" implementation "org.springframework.security:spring-security-web"