Updated configurable infinispan-client-setup.sh

Author: miuponn

ga/latest/kernel/helpers/build/infinispan-client-setup.sh

@@ -16,9 +16,14 @@
 
 set -Eeo pipefail
 
-INFINISPAN_LATEST_STABLE_VERSION="14.0.35.Final"
-INFINISPAN_CLIENT_VERSION=${INFINISPAN_CLIENT_VERSION:-$INFINISPAN_LATEST_STABLE_VERSION}
-INFINISPAN_USE_LATEST_STABLE=${INFINISPAN_USE_LATEST_STABLE:-false}
+# Recommended stable baseline for Jakarta EE 10 / JDK 17+ environments.
+INFINISPAN_DEFAULT_VERSION="15.2.6.Final"
+INFINISPAN_CLIENT_VERSION=${INFINISPAN_CLIENT_VERSION:-$INFINISPAN_DEFAULT_VERSION}
+
+# Resolves the latest patch release (x.y.Z) within the specified major.minor version.
+INFINISPAN_USE_LATEST_PATCH=${INFINISPAN_USE_LATEST_PATCH:-false}
+# Required for Infinispan 11+ on Liberty. Hard dependency for Liberty sessionCache-1.0.
+INFINISPAN_ENABLE_REACTIVE_STREAMS=${INFINISPAN_ENABLE_REACTIVE_STREAMS:-true}
 
 pkgcmd=yum
 if ! command $pkgcmd
@@ -28,7 +33,10 @@ fi
 
 $pkgcmd update -y
 $pkgcmd install -y maven
-mkdir -p /opt/ibm/wlp/usr/shared/resources/infinispan
+
+CLIENT_JARS_DIR="/opt/ibm/wlp/usr/shared/resources/infinispan"
+mkdir -p "${CLIENT_JARS_DIR}"
+
 cat << EOF > /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml
 <project xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
@@ -37,6 +45,7 @@ cat << EOF > /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml
   <groupId>io.openliberty</groupId>
   <artifactId>openliberty-infinispan-client</artifactId>
   <version>1.0</version>
+
   <!-- https://mvnrepository.com/artifact/org.infinispan/infinispan-jcache-remote -->
   <dependencies>
     <dependency>
@@ -48,18 +57,34 @@ cat << EOF > /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml
 </project>
 EOF
 
-if [ "${INFINISPAN_USE_LATEST_STABLE}" = "true" ]; then
-  echo "Finding latest stable Infinispan client version..."
-  mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml versions:use-latest-releases -DallowMajorUpdates=false
+if [ "${INFINISPAN_USE_LATEST_PATCH}" = "true" ]; then
+  echo "Resolving latest Infinispan client patch release (no major upgrades)..."
+  mvn -f "${CLIENT_JARS_DIR}/pom.xml" versions:use-latest-releases -DallowMajorUpdates=false
 fi
-mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml dependency:copy-dependencies -DoutputDirectory=/opt/ibm/wlp/usr/shared/resources/infinispan
+
+mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml dependency:copy-dependencies -DoutputDirectory="${CLIENT_JARS_DIR}"
 # This fails with dependency errors using microdnf on ubi-minimal, but it is okay to let it fail
 yum remove -y maven || true
-rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml
-rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/jboss-transaction-api*.jar
-rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/reactive-streams-*.jar
-rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/rxjava-*.jar
+rm -f "${CLIENT_JARS_DIR}/pom.xml"
+
+# Remove unnecessary spec jars
+rm -f "${CLIENT_JARS_DIR}"/jboss-transaction-api*.jar
+rm -f "${CLIENT_JARS_DIR}"/jakarta.transaction-api*.jar
+
+# Reactive streams are required for Infinispan 11+ on Liberty sessionCache-1.0
+# Only remove if explicitly disabled (default: enabled)
+if [ "${INFINISPAN_ENABLE_REACTIVE_STREAMS}" != "true" ]; then
+  echo "Removing reactive-streams and rxjava jars as INFINISPAN_ENABLE_REACTIVE_STREAMS is not set to true..."
+  rm -f "${CLIENT_JARS_DIR}"/reactive-streams-*.jar
+  rm -f "${CLIENT_JARS_DIR}"/rxjava-*.jar
+fi
+
 rm -rf ~/.m2
-chown -R 1001:0 /opt/ibm/wlp/usr/shared/resources/infinispan
-chmod -R g+rw /opt/ibm/wlp/usr/shared/resources/infinispan
+chown -R 1001:0 "${CLIENT_JARS_DIR}"
+chmod -R g+rw "${CLIENT_JARS_DIR}"
 
+INSTALLED_VERSION=$(find "${CLIENT_JARS_DIR}/" -name "*infinispan-commons*.jar" -printf "%f" | sed 's/infinispan-commons-\(.*\).jar/\1/')
+
+if [ -n "$INSTALLED_VERSION" ]; then
+  echo "Successfully installed Infinispan client version: ${INSTALLED_VERSION}"
+fi