From 71271dc38261e91db81dbe0ef574b44d2870f7ed Mon Sep 17 00:00:00 2001
From: kabicin <kirbychin99@gmail.com>
Date: Thu, 15 Sep 2022 07:29:37 -0700
Subject: [PATCH 1/8] Add service name and remove beta support tag in
 infinispan-client-sessioncache.xml

---
 .../infinispan-client-sessioncache.xml                      | 3 +--
 releases/24.0.0.12/full/helpers/runtime/docker-server.sh    | 2 ++
 .../infinispan-client-sessioncache.xml                      | 3 +--
 .../24.0.0.12/kernel-slim/helpers/runtime/docker-server.sh  | 2 ++
 .../infinispan-client-sessioncache.xml                      | 3 +--
 releases/latest/beta/helpers/runtime/docker-server.sh       | 2 ++
 .../infinispan-client-sessioncache.xml                      | 3 +--
 releases/latest/full/helpers/runtime/docker-server.sh       | 2 ++
 .../infinispan-client-sessioncache.xml                      | 6 ++++--
 .../latest/kernel-slim/helpers/runtime/docker-server.sh     | 2 ++
 10 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/releases/24.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/24.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index e2ec72d2c..8cfedf979 100644
--- a/releases/24.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/24.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -3,7 +3,7 @@
     <feature>sessionCache-1.0</feature>
   </featureManager>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -12,7 +12,6 @@
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>
diff --git a/releases/24.0.0.12/full/helpers/runtime/docker-server.sh b/releases/24.0.0.12/full/helpers/runtime/docker-server.sh
index 4c36a2e1c..46cec2784 100755
--- a/releases/24.0.0.12/full/helpers/runtime/docker-server.sh
+++ b/releases/24.0.0.12/full/helpers/runtime/docker-server.sh
@@ -100,6 +100,8 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
+ INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
+ export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 
diff --git a/releases/24.0.0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/24.0.0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index d835cb4e9..a3948f5ce 100644
--- a/releases/24.0.0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/24.0.0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -1,6 +1,6 @@
 <server>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -9,7 +9,6 @@
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>
diff --git a/releases/24.0.0.12/kernel-slim/helpers/runtime/docker-server.sh b/releases/24.0.0.12/kernel-slim/helpers/runtime/docker-server.sh
index 4c36a2e1c..46cec2784 100755
--- a/releases/24.0.0.12/kernel-slim/helpers/runtime/docker-server.sh
+++ b/releases/24.0.0.12/kernel-slim/helpers/runtime/docker-server.sh
@@ -100,6 +100,8 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
+ INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
+ export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 
diff --git a/releases/latest/beta/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/latest/beta/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index e2ec72d2c..8cfedf979 100644
--- a/releases/latest/beta/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/latest/beta/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -3,7 +3,7 @@
     <feature>sessionCache-1.0</feature>
   </featureManager>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -12,7 +12,6 @@
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>
diff --git a/releases/latest/beta/helpers/runtime/docker-server.sh b/releases/latest/beta/helpers/runtime/docker-server.sh
index 4c36a2e1c..46cec2784 100755
--- a/releases/latest/beta/helpers/runtime/docker-server.sh
+++ b/releases/latest/beta/helpers/runtime/docker-server.sh
@@ -100,6 +100,8 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
+ INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
+ export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 
diff --git a/releases/latest/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/latest/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index e2ec72d2c..8cfedf979 100644
--- a/releases/latest/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/latest/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -3,7 +3,7 @@
     <feature>sessionCache-1.0</feature>
   </featureManager>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -12,7 +12,6 @@
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>
diff --git a/releases/latest/full/helpers/runtime/docker-server.sh b/releases/latest/full/helpers/runtime/docker-server.sh
index 4c36a2e1c..46cec2784 100755
--- a/releases/latest/full/helpers/runtime/docker-server.sh
+++ b/releases/latest/full/helpers/runtime/docker-server.sh
@@ -100,6 +100,8 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
+ INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
+ export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 
diff --git a/releases/latest/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/latest/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index d835cb4e9..8cfedf979 100644
--- a/releases/latest/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/latest/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -1,6 +1,9 @@
 <server>
+  <featureManager>
+    <feature>sessionCache-1.0</feature>
+  </featureManager>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -9,7 +12,6 @@
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>
diff --git a/releases/latest/kernel-slim/helpers/runtime/docker-server.sh b/releases/latest/kernel-slim/helpers/runtime/docker-server.sh
index 4c36a2e1c..46cec2784 100755
--- a/releases/latest/kernel-slim/helpers/runtime/docker-server.sh
+++ b/releases/latest/kernel-slim/helpers/runtime/docker-server.sh
@@ -100,6 +100,8 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
+ INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
+ export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 

From 46833d40f0b909b0958a6d229eb0415614141756 Mon Sep 17 00:00:00 2001
From: kabicin <kirbychin99@gmail.com>
Date: Thu, 15 Sep 2022 07:38:00 -0700
Subject: [PATCH 2/8] Add maven:3.6 module stream to infinispan-client-setup.sh

---
 releases/24.0.0.12/full/helpers/build/infinispan-client-setup.sh | 1 +
 .../kernel-slim/helpers/build/infinispan-client-setup.sh         | 1 +
 releases/latest/beta/helpers/build/infinispan-client-setup.sh    | 1 +
 releases/latest/full/helpers/build/infinispan-client-setup.sh    | 1 +
 .../latest/kernel-slim/helpers/build/infinispan-client-setup.sh  | 1 +
 5 files changed, 5 insertions(+)

diff --git a/releases/24.0.0.12/full/helpers/build/infinispan-client-setup.sh b/releases/24.0.0.12/full/helpers/build/infinispan-client-setup.sh
index e6a95e6b7..1fb50e32d 100755
--- a/releases/24.0.0.12/full/helpers/build/infinispan-client-setup.sh
+++ b/releases/24.0.0.12/full/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/24.0.0.12/kernel-slim/helpers/build/infinispan-client-setup.sh b/releases/24.0.0.12/kernel-slim/helpers/build/infinispan-client-setup.sh
index e6a95e6b7..1fb50e32d 100755
--- a/releases/24.0.0.12/kernel-slim/helpers/build/infinispan-client-setup.sh
+++ b/releases/24.0.0.12/kernel-slim/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/latest/beta/helpers/build/infinispan-client-setup.sh b/releases/latest/beta/helpers/build/infinispan-client-setup.sh
index 4f6df9a22..ece99e114 100755
--- a/releases/latest/beta/helpers/build/infinispan-client-setup.sh
+++ b/releases/latest/beta/helpers/build/infinispan-client-setup.sh
@@ -3,6 +3,7 @@
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/latest/full/helpers/build/infinispan-client-setup.sh b/releases/latest/full/helpers/build/infinispan-client-setup.sh
index 4f6df9a22..ece99e114 100755
--- a/releases/latest/full/helpers/build/infinispan-client-setup.sh
+++ b/releases/latest/full/helpers/build/infinispan-client-setup.sh
@@ -3,6 +3,7 @@
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/latest/kernel-slim/helpers/build/infinispan-client-setup.sh b/releases/latest/kernel-slim/helpers/build/infinispan-client-setup.sh
index 4f6df9a22..ece99e114 100755
--- a/releases/latest/kernel-slim/helpers/build/infinispan-client-setup.sh
+++ b/releases/latest/kernel-slim/helpers/build/infinispan-client-setup.sh
@@ -3,6 +3,7 @@
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan

From 7f1da6542f149b57d43d37c6ec099dd6212a400b Mon Sep 17 00:00:00 2001
From: kabicin <kirbychin99@gmail.com>
Date: Fri, 16 Sep 2022 08:32:09 -0700
Subject: [PATCH 3/8] Set Infinispan truststore to use OpenShift Service CA by
 default

---
 .../infinispan-client-sessioncache.xml                       | 1 +
 releases/24.0.0.12/full/helpers/runtime/docker-server.sh     | 5 +++++
 .../infinispan-client-sessioncache.xml                       | 1 +
 .../24.0.0.12/kernel-slim/helpers/runtime/docker-server.sh   | 5 +++++
 .../infinispan-client-sessioncache.xml                       | 1 +
 releases/latest/full/helpers/runtime/docker-server.sh        | 5 +++++
 .../infinispan-client-sessioncache.xml                       | 1 +
 releases/latest/kernel-slim/helpers/runtime/docker-server.sh | 5 +++++
 8 files changed, 24 insertions(+)

diff --git a/releases/24.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/24.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index 8cfedf979..4e925c03e 100644
--- a/releases/24.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/24.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -11,6 +11,7 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
diff --git a/releases/24.0.0.12/full/helpers/runtime/docker-server.sh b/releases/24.0.0.12/full/helpers/runtime/docker-server.sh
index 46cec2784..7addee9f7 100755
--- a/releases/24.0.0.12/full/helpers/runtime/docker-server.sh
+++ b/releases/24.0.0.12/full/helpers/runtime/docker-server.sh
@@ -126,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
+
+ if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
+  export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+ fi
+ echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi
 
 
diff --git a/releases/24.0.0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/24.0.0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index a3948f5ce..3076fccc7 100644
--- a/releases/24.0.0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/24.0.0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -8,6 +8,7 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
diff --git a/releases/24.0.0.12/kernel-slim/helpers/runtime/docker-server.sh b/releases/24.0.0.12/kernel-slim/helpers/runtime/docker-server.sh
index 46cec2784..7addee9f7 100755
--- a/releases/24.0.0.12/kernel-slim/helpers/runtime/docker-server.sh
+++ b/releases/24.0.0.12/kernel-slim/helpers/runtime/docker-server.sh
@@ -126,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
+
+ if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
+  export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+ fi
+ echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi
 
 
diff --git a/releases/latest/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/latest/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index 8cfedf979..4e925c03e 100644
--- a/releases/latest/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/latest/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -11,6 +11,7 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
diff --git a/releases/latest/full/helpers/runtime/docker-server.sh b/releases/latest/full/helpers/runtime/docker-server.sh
index 46cec2784..bb32cc07f 100755
--- a/releases/latest/full/helpers/runtime/docker-server.sh
+++ b/releases/latest/full/helpers/runtime/docker-server.sh
@@ -126,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
+
+ if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
+   export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+ fi
+ echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi
 
 
diff --git a/releases/latest/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/latest/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index 8cfedf979..4e925c03e 100644
--- a/releases/latest/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/latest/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -11,6 +11,7 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
diff --git a/releases/latest/kernel-slim/helpers/runtime/docker-server.sh b/releases/latest/kernel-slim/helpers/runtime/docker-server.sh
index 46cec2784..7addee9f7 100755
--- a/releases/latest/kernel-slim/helpers/runtime/docker-server.sh
+++ b/releases/latest/kernel-slim/helpers/runtime/docker-server.sh
@@ -126,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
+
+ if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
+  export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+ fi
+ echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi
 
 

From d522154b7e9ce8e677799f99d694ed4c0265b42e Mon Sep 17 00:00:00 2001
From: kabicin <kirbychin99@gmail.com>
Date: Tue, 4 Oct 2022 07:14:54 -0700
Subject: [PATCH 4/8] Move infinispan changes to 22.0.0.10

---
 .../infinispan-client-sessioncache.xml                     | 4 ++--
 .../full/helpers/build/infinispan-client-setup.sh          | 1 -
 releases/24.0.0.12/full/helpers/runtime/docker-server.sh   | 7 -------
 .../infinispan-client-sessioncache.xml                     | 4 ++--
 .../kernel-slim/helpers/build/infinispan-client-setup.sh   | 1 -
 .../24.0.0.12/kernel-slim/helpers/runtime/docker-server.sh | 7 -------
 .../infinispan-client-sessioncache.xml                     | 4 ++--
 .../24.0.0.9/full/helpers/build/infinispan-client-setup.sh | 1 +
 releases/24.0.0.9/full/helpers/runtime/docker-server.sh    | 7 +++++++
 .../infinispan-client-sessioncache.xml                     | 4 ++--
 .../kernel-slim/helpers/build/infinispan-client-setup.sh   | 1 +
 .../24.0.0.9/kernel-slim/helpers/runtime/docker-server.sh  | 7 +++++++
 12 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/releases/24.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/24.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index 4e925c03e..e2ec72d2c 100644
--- a/releases/24.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/24.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -3,7 +3,7 @@
     <feature>sessionCache-1.0</feature>
   </featureManager>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -11,8 +11,8 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
-    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
+  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>
diff --git a/releases/24.0.0.12/full/helpers/build/infinispan-client-setup.sh b/releases/24.0.0.12/full/helpers/build/infinispan-client-setup.sh
index 1fb50e32d..e6a95e6b7 100755
--- a/releases/24.0.0.12/full/helpers/build/infinispan-client-setup.sh
+++ b/releases/24.0.0.12/full/helpers/build/infinispan-client-setup.sh
@@ -5,7 +5,6 @@ fi
 
 set -Eeox pipefail
 
-yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/24.0.0.12/full/helpers/runtime/docker-server.sh b/releases/24.0.0.12/full/helpers/runtime/docker-server.sh
index 7addee9f7..4c36a2e1c 100755
--- a/releases/24.0.0.12/full/helpers/runtime/docker-server.sh
+++ b/releases/24.0.0.12/full/helpers/runtime/docker-server.sh
@@ -100,8 +100,6 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
- INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
- export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 
@@ -126,11 +124,6 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
-
- if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
-  export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
- fi
- echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi
 
 
diff --git a/releases/24.0.0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/24.0.0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index 3076fccc7..d835cb4e9 100644
--- a/releases/24.0.0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/24.0.0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -1,6 +1,6 @@
 <server>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -8,8 +8,8 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
-    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
+  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>
diff --git a/releases/24.0.0.12/kernel-slim/helpers/build/infinispan-client-setup.sh b/releases/24.0.0.12/kernel-slim/helpers/build/infinispan-client-setup.sh
index 1fb50e32d..e6a95e6b7 100755
--- a/releases/24.0.0.12/kernel-slim/helpers/build/infinispan-client-setup.sh
+++ b/releases/24.0.0.12/kernel-slim/helpers/build/infinispan-client-setup.sh
@@ -5,7 +5,6 @@ fi
 
 set -Eeox pipefail
 
-yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/24.0.0.12/kernel-slim/helpers/runtime/docker-server.sh b/releases/24.0.0.12/kernel-slim/helpers/runtime/docker-server.sh
index 7addee9f7..4c36a2e1c 100755
--- a/releases/24.0.0.12/kernel-slim/helpers/runtime/docker-server.sh
+++ b/releases/24.0.0.12/kernel-slim/helpers/runtime/docker-server.sh
@@ -100,8 +100,6 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
- INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
- export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 
@@ -126,11 +124,6 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
-
- if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
-  export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
- fi
- echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi
 
 
diff --git a/releases/24.0.0.9/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/24.0.0.9/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index e2ec72d2c..4e925c03e 100644
--- a/releases/24.0.0.9/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/24.0.0.9/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -3,7 +3,7 @@
     <feature>sessionCache-1.0</feature>
   </featureManager>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -11,8 +11,8 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>
diff --git a/releases/24.0.0.9/full/helpers/build/infinispan-client-setup.sh b/releases/24.0.0.9/full/helpers/build/infinispan-client-setup.sh
index e6a95e6b7..1fb50e32d 100755
--- a/releases/24.0.0.9/full/helpers/build/infinispan-client-setup.sh
+++ b/releases/24.0.0.9/full/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/24.0.0.9/full/helpers/runtime/docker-server.sh b/releases/24.0.0.9/full/helpers/runtime/docker-server.sh
index 4c36a2e1c..7addee9f7 100755
--- a/releases/24.0.0.9/full/helpers/runtime/docker-server.sh
+++ b/releases/24.0.0.9/full/helpers/runtime/docker-server.sh
@@ -100,6 +100,8 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
+ INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
+ export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 
@@ -124,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
+
+ if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
+  export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+ fi
+ echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi
 
 
diff --git a/releases/24.0.0.9/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/24.0.0.9/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index d835cb4e9..3076fccc7 100644
--- a/releases/24.0.0.9/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/24.0.0.9/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -1,6 +1,6 @@
 <server>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -8,8 +8,8 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>
diff --git a/releases/24.0.0.9/kernel-slim/helpers/build/infinispan-client-setup.sh b/releases/24.0.0.9/kernel-slim/helpers/build/infinispan-client-setup.sh
index e6a95e6b7..1fb50e32d 100755
--- a/releases/24.0.0.9/kernel-slim/helpers/build/infinispan-client-setup.sh
+++ b/releases/24.0.0.9/kernel-slim/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/24.0.0.9/kernel-slim/helpers/runtime/docker-server.sh b/releases/24.0.0.9/kernel-slim/helpers/runtime/docker-server.sh
index 4c36a2e1c..7addee9f7 100755
--- a/releases/24.0.0.9/kernel-slim/helpers/runtime/docker-server.sh
+++ b/releases/24.0.0.9/kernel-slim/helpers/runtime/docker-server.sh
@@ -100,6 +100,8 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
+ INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
+ export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 
@@ -124,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
+
+ if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
+  export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+ fi
+ echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi
 
 

From 05b36c4e5f7a66e5ba74af4b9978e22afe80c77c Mon Sep 17 00:00:00 2001
From: kabicin <kirbychin99@gmail.com>
Date: Wed, 5 Oct 2022 08:00:02 -0700
Subject: [PATCH 5/8] Update infinispan changes in beta-instanton

---
 .../infinispan-client-sessioncache.xml                     | 3 +--
 .../full/helpers/build/infinispan-client-setup.sh          | 1 +
 releases/24.0.0.12/full/helpers/runtime/docker-server.sh   | 7 +++++++
 releases/latest/beta/helpers/runtime/docker-server.sh      | 5 +++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/releases/24.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/24.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index e2ec72d2c..8cfedf979 100644
--- a/releases/24.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/24.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -3,7 +3,7 @@
     <feature>sessionCache-1.0</feature>
   </featureManager>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -12,7 +12,6 @@
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>
diff --git a/releases/24.0.0.12/full/helpers/build/infinispan-client-setup.sh b/releases/24.0.0.12/full/helpers/build/infinispan-client-setup.sh
index e6a95e6b7..1fb50e32d 100755
--- a/releases/24.0.0.12/full/helpers/build/infinispan-client-setup.sh
+++ b/releases/24.0.0.12/full/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/24.0.0.12/full/helpers/runtime/docker-server.sh b/releases/24.0.0.12/full/helpers/runtime/docker-server.sh
index 4c36a2e1c..bb32cc07f 100755
--- a/releases/24.0.0.12/full/helpers/runtime/docker-server.sh
+++ b/releases/24.0.0.12/full/helpers/runtime/docker-server.sh
@@ -100,6 +100,8 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
+ INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
+ export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 
@@ -124,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
+
+ if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
+   export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+ fi
+ echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi
 
 
diff --git a/releases/latest/beta/helpers/runtime/docker-server.sh b/releases/latest/beta/helpers/runtime/docker-server.sh
index 46cec2784..bb32cc07f 100755
--- a/releases/latest/beta/helpers/runtime/docker-server.sh
+++ b/releases/latest/beta/helpers/runtime/docker-server.sh
@@ -126,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
+
+ if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
+   export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+ fi
+ echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi
 
 

From 66362caa7a2f555b4162fc116eadafcbc7f70286 Mon Sep 17 00:00:00 2001
From: kabicin <kirbychin99@gmail.com>
Date: Fri, 2 Jun 2023 11:38:01 -0400
Subject: [PATCH 6/8] Rebase to 23.0.0.5

---
 .../infinispan-client-sessioncache.xml                     | 1 +
 .../infinispan-client-sessioncache.xml                     | 4 ++--
 .../kernel-slim/helpers/build/infinispan-client-setup.sh   | 1 +
 .../24.0.0.12/kernel-slim/helpers/runtime/docker-server.sh | 7 +++++++
 .../infinispan-client-sessioncache.xml                     | 4 ++--
 releases/25.0.0.2/full/helpers/runtime/docker-server.sh    | 7 +++++++
 .../infinispan-client-sessioncache.xml                     | 4 ++--
 .../infinispan-client-sessioncache.xml                     | 1 +
 8 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/releases/24.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/24.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index 8cfedf979..4e925c03e 100644
--- a/releases/24.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/24.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -11,6 +11,7 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
diff --git a/releases/24.0.0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/24.0.0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index d835cb4e9..3076fccc7 100644
--- a/releases/24.0.0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/24.0.0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -1,6 +1,6 @@
 <server>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -8,8 +8,8 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>
diff --git a/releases/24.0.0.12/kernel-slim/helpers/build/infinispan-client-setup.sh b/releases/24.0.0.12/kernel-slim/helpers/build/infinispan-client-setup.sh
index e6a95e6b7..1fb50e32d 100755
--- a/releases/24.0.0.12/kernel-slim/helpers/build/infinispan-client-setup.sh
+++ b/releases/24.0.0.12/kernel-slim/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/24.0.0.12/kernel-slim/helpers/runtime/docker-server.sh b/releases/24.0.0.12/kernel-slim/helpers/runtime/docker-server.sh
index 4c36a2e1c..7addee9f7 100755
--- a/releases/24.0.0.12/kernel-slim/helpers/runtime/docker-server.sh
+++ b/releases/24.0.0.12/kernel-slim/helpers/runtime/docker-server.sh
@@ -100,6 +100,8 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
+ INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
+ export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 
@@ -124,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
+
+ if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
+  export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+ fi
+ echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi
 
 
diff --git a/releases/25.0.0.2/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/25.0.0.2/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index e2ec72d2c..4e925c03e 100644
--- a/releases/25.0.0.2/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/25.0.0.2/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -3,7 +3,7 @@
     <feature>sessionCache-1.0</feature>
   </featureManager>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -11,8 +11,8 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>
diff --git a/releases/25.0.0.2/full/helpers/runtime/docker-server.sh b/releases/25.0.0.2/full/helpers/runtime/docker-server.sh
index 4c36a2e1c..7addee9f7 100755
--- a/releases/25.0.0.2/full/helpers/runtime/docker-server.sh
+++ b/releases/25.0.0.2/full/helpers/runtime/docker-server.sh
@@ -100,6 +100,8 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
+ INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
+ export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 
@@ -124,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
+
+ if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
+  export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+ fi
+ echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi
 
 
diff --git a/releases/25.0.0.2/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/25.0.0.2/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index d835cb4e9..3076fccc7 100644
--- a/releases/25.0.0.2/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/25.0.0.2/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -1,6 +1,6 @@
 <server>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -8,8 +8,8 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>
diff --git a/releases/latest/beta/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/latest/beta/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index 8cfedf979..4e925c03e 100644
--- a/releases/latest/beta/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/latest/beta/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -11,6 +11,7 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>

From 9bb7a932f9aac955c3db94020362cdd7f44d7f94 Mon Sep 17 00:00:00 2001
From: kabicin <37311900+kabicin@users.noreply.github.com>
Date: Wed, 12 Mar 2025 16:59:56 -0400
Subject: [PATCH 7/8] Revert maven:3.6 update

---
 releases/24.0.0.12/full/helpers/build/infinispan-client-setup.sh | 1 -
 .../kernel-slim/helpers/build/infinispan-client-setup.sh         | 1 -
 releases/24.0.0.9/full/helpers/build/infinispan-client-setup.sh  | 1 -
 .../kernel-slim/helpers/build/infinispan-client-setup.sh         | 1 -
 4 files changed, 4 deletions(-)

diff --git a/releases/24.0.0.12/full/helpers/build/infinispan-client-setup.sh b/releases/24.0.0.12/full/helpers/build/infinispan-client-setup.sh
index 1fb50e32d..e6a95e6b7 100755
--- a/releases/24.0.0.12/full/helpers/build/infinispan-client-setup.sh
+++ b/releases/24.0.0.12/full/helpers/build/infinispan-client-setup.sh
@@ -5,7 +5,6 @@ fi
 
 set -Eeox pipefail
 
-yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/24.0.0.12/kernel-slim/helpers/build/infinispan-client-setup.sh b/releases/24.0.0.12/kernel-slim/helpers/build/infinispan-client-setup.sh
index 1fb50e32d..e6a95e6b7 100755
--- a/releases/24.0.0.12/kernel-slim/helpers/build/infinispan-client-setup.sh
+++ b/releases/24.0.0.12/kernel-slim/helpers/build/infinispan-client-setup.sh
@@ -5,7 +5,6 @@ fi
 
 set -Eeox pipefail
 
-yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/24.0.0.9/full/helpers/build/infinispan-client-setup.sh b/releases/24.0.0.9/full/helpers/build/infinispan-client-setup.sh
index 1fb50e32d..e6a95e6b7 100755
--- a/releases/24.0.0.9/full/helpers/build/infinispan-client-setup.sh
+++ b/releases/24.0.0.9/full/helpers/build/infinispan-client-setup.sh
@@ -5,7 +5,6 @@ fi
 
 set -Eeox pipefail
 
-yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/24.0.0.9/kernel-slim/helpers/build/infinispan-client-setup.sh b/releases/24.0.0.9/kernel-slim/helpers/build/infinispan-client-setup.sh
index 1fb50e32d..e6a95e6b7 100755
--- a/releases/24.0.0.9/kernel-slim/helpers/build/infinispan-client-setup.sh
+++ b/releases/24.0.0.9/kernel-slim/helpers/build/infinispan-client-setup.sh
@@ -5,7 +5,6 @@ fi
 
 set -Eeox pipefail
 
-yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan

From 6c890dbb8ad1bdfb98ad000c2be2e8b12d3ea2c6 Mon Sep 17 00:00:00 2001
From: kabicin <37311900+kabicin@users.noreply.github.com>
Date: Wed, 12 Mar 2025 17:05:47 -0400
Subject: [PATCH 8/8] Revert maven:3.6 update

---
 .../25.0.0.2/kernel-slim/helpers/runtime/docker-server.sh  | 7 +++++++
 .../latest/beta/helpers/build/infinispan-client-setup.sh   | 1 -
 .../latest/full/helpers/build/infinispan-client-setup.sh   | 1 -
 .../infinispan-client-sessioncache.xml                     | 3 ---
 .../kernel-slim/helpers/build/infinispan-client-setup.sh   | 1 -
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/releases/25.0.0.2/kernel-slim/helpers/runtime/docker-server.sh b/releases/25.0.0.2/kernel-slim/helpers/runtime/docker-server.sh
index 4c36a2e1c..7addee9f7 100755
--- a/releases/25.0.0.2/kernel-slim/helpers/runtime/docker-server.sh
+++ b/releases/25.0.0.2/kernel-slim/helpers/runtime/docker-server.sh
@@ -100,6 +100,8 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
+ INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
+ export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 
@@ -124,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
+
+ if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
+  export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+ fi
+ echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi
 
 
diff --git a/releases/latest/beta/helpers/build/infinispan-client-setup.sh b/releases/latest/beta/helpers/build/infinispan-client-setup.sh
index ece99e114..4f6df9a22 100755
--- a/releases/latest/beta/helpers/build/infinispan-client-setup.sh
+++ b/releases/latest/beta/helpers/build/infinispan-client-setup.sh
@@ -3,7 +3,6 @@
 
 set -Eeox pipefail
 
-yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/latest/full/helpers/build/infinispan-client-setup.sh b/releases/latest/full/helpers/build/infinispan-client-setup.sh
index ece99e114..4f6df9a22 100755
--- a/releases/latest/full/helpers/build/infinispan-client-setup.sh
+++ b/releases/latest/full/helpers/build/infinispan-client-setup.sh
@@ -3,7 +3,6 @@
 
 set -Eeox pipefail
 
-yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/latest/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/latest/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index 4e925c03e..3076fccc7 100644
--- a/releases/latest/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/latest/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -1,7 +1,4 @@
 <server>
-  <featureManager>
-    <feature>sessionCache-1.0</feature>
-  </featureManager>
   <httpSessionCache libraryRef="InfinispanLib">
     <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
diff --git a/releases/latest/kernel-slim/helpers/build/infinispan-client-setup.sh b/releases/latest/kernel-slim/helpers/build/infinispan-client-setup.sh
index ece99e114..4f6df9a22 100755
--- a/releases/latest/kernel-slim/helpers/build/infinispan-client-setup.sh
+++ b/releases/latest/kernel-slim/helpers/build/infinispan-client-setup.sh
@@ -3,7 +3,6 @@
 
 set -Eeox pipefail
 
-yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan