From 8ab7a8f7422a8f3f41f89f51f41fb92fe5e7e359 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 24 Mar 2021 18:23:50 -0500
Subject: [PATCH] Issue #6063 - expose hazelcast.version (#6064)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 .../config/modules/session-store-hazelcast-embedded.mod  | 7 +++++--
 .../config/modules/session-store-hazelcast-remote.mod    | 9 +++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod b/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod
index f0c33c617680..85d03fb03ed1 100644
--- a/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod
+++ b/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod
@@ -13,14 +13,17 @@ session-store
 sessions
 
 [files]
-maven://com.hazelcast/hazelcast/4.1|lib/hazelcast/hazelcast-4.1.jar
+maven://com.hazelcast/hazelcast/${hazelcast.version}|lib/hazelcast/hazelcast-${hazelcast.version}.jar
 
 [xml]
 etc/sessions/hazelcast/default.xml
 
 [lib]
 lib/jetty-hazelcast-${jetty.version}.jar
-lib/hazelcast/*.jar
+lib/hazelcast/hazelcast-${hazelcast.version}.jar
+
+[ini]
+hazelcast.version?=4.1
 
 [license]
 Hazelcast is an open source project hosted on Github and released under the Apache 2.0 license.
diff --git a/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod b/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod
index c6d8b01ef037..4174d4735818 100644
--- a/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod
+++ b/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod
@@ -13,14 +13,19 @@ session-store
 sessions
 
 [files]
-maven://com.hazelcast/hazelcast/4.1|lib/hazelcast/hazelcast-4.1.jar
+maven://com.hazelcast/hazelcast/${hazelcast.version}|lib/hazelcast/hazelcast-${hazelcast.version}.jar
+maven://com.hazelcast/hazelcast-client/${hazelcast.version}|lib/hazelcast/hazelcast-client-${hazelcast.version}.jar
 
 [xml]
 etc/sessions/hazelcast/remote.xml
 
 [lib]
 lib/jetty-hazelcast-${jetty.version}.jar
-lib/hazelcast/*.jar
+lib/hazelcast/hazelcast-${hazelcast.version}.jar
+lib/hazelcast/hazelcast-client-${hazelcast.version}.jar
+
+[ini]
+hazelcast.version?=4.1
 
 [license]
 Hazelcast is an open source project hosted on Github and released under the Apache 2.0 license.