From 62d745f4ea350cad41a067aa48f728329f38774c Mon Sep 17 00:00:00 2001 From: Kelly Gao Date: Thu, 29 May 2025 15:39:23 -0400 Subject: [PATCH 1/3] Make infinispan client version configurable via env variable --- .../helpers/build/infinispan-client-setup.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/ga/latest/kernel/helpers/build/infinispan-client-setup.sh b/ga/latest/kernel/helpers/build/infinispan-client-setup.sh index ca8a36f4..db393b9d 100755 --- a/ga/latest/kernel/helpers/build/infinispan-client-setup.sh +++ b/ga/latest/kernel/helpers/build/infinispan-client-setup.sh @@ -12,10 +12,13 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -. /opt/ibm/helpers/build/internal/logger.sh +#. /opt/ibm/helpers/build/internal/logger.sh set -Eeox pipefail +INFINISPAN_CLIENT_VERSION=${INFINISPAN_CLIENT_VERSION:-10.1.3.Final} +USE_LATEST_COMPATIBLE=${USE_LATEST_COMPATIBLE:-false} + pkgcmd=yum if ! command $pkgcmd then @@ -25,8 +28,12 @@ fi $pkgcmd update -y $pkgcmd install -y maven mkdir -p /opt/ibm/wlp/usr/shared/resources/infinispan -echo ' 4.0.0 io.openliberty openliberty-infinispan-client 1.0 org.infinispan infinispan-jcache-remote 10.1.3.Final ' > /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml -mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml versions:use-latest-releases -DallowMajorUpdates=false +echo ' 4.0.0 io.openliberty openliberty-infinispan-client 1.0 org.infinispan infinispan-jcache-remote '${INFINISPAN_CLIENT_VERSION}' ' > /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml + +if [ "${USE_LATEST_COMPATIBLE}" = "true" ]; then + echo "[INFO] Finding latest compatible version..." + mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/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 # This fails with dependency errors using microdnf on ubi-minimal, but it is okay to let it fail yum remove -y maven || true @@ -38,3 +45,7 @@ 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 +INSTALLED_VERSION=$(find /opt/ibm/wlp/usr/shared/resources/infinispan/ -name "*infinispan-commons*" -printf "%f\n" | sed 's/infinispan-commons-\(.*\).jar/\1/') +if [ -n "$INSTALLED_VERSION" ]; then + echo "[INFO] Successfully installed Infinispan client version: ${INSTALLED_VERSION}" +fi From 42fa8664943c595e216d56125bf7af93eb0f3dd1 Mon Sep 17 00:00:00 2001 From: Kelly Gao Date: Thu, 29 May 2025 15:58:51 -0400 Subject: [PATCH 2/3] Uncommented logger inclusion --- ga/latest/kernel/helpers/build/infinispan-client-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ga/latest/kernel/helpers/build/infinispan-client-setup.sh b/ga/latest/kernel/helpers/build/infinispan-client-setup.sh index db393b9d..d426b4ea 100755 --- a/ga/latest/kernel/helpers/build/infinispan-client-setup.sh +++ b/ga/latest/kernel/helpers/build/infinispan-client-setup.sh @@ -12,7 +12,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -#. /opt/ibm/helpers/build/internal/logger.sh +. /opt/ibm/helpers/build/internal/logger.sh set -Eeox pipefail From 0c5086ce48227616af352e15337f7d2d73c2f0de Mon Sep 17 00:00:00 2001 From: Miuponn Date: Thu, 12 Jun 2025 14:49:29 -0400 Subject: [PATCH 3/3] Fixed script readility with heredoc and file patterns --- .../helpers/build/infinispan-client-setup.sh | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/ga/latest/kernel/helpers/build/infinispan-client-setup.sh b/ga/latest/kernel/helpers/build/infinispan-client-setup.sh index d426b4ea..a4884e38 100755 --- a/ga/latest/kernel/helpers/build/infinispan-client-setup.sh +++ b/ga/latest/kernel/helpers/build/infinispan-client-setup.sh @@ -28,10 +28,27 @@ fi $pkgcmd update -y $pkgcmd install -y maven mkdir -p /opt/ibm/wlp/usr/shared/resources/infinispan -echo ' 4.0.0 io.openliberty openliberty-infinispan-client 1.0 org.infinispan infinispan-jcache-remote '${INFINISPAN_CLIENT_VERSION}' ' > /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml +cat << EOF > /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml + + 4.0.0 + io.openliberty + openliberty-infinispan-client + 1.0 + + + + org.infinispan + infinispan-jcache-remote + ${INFINISPAN_CLIENT_VERSION} + + + +EOF if [ "${USE_LATEST_COMPATIBLE}" = "true" ]; then - echo "[INFO] Finding latest compatible version..." + echo "Finding latest compatible Infinispan client version..." mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/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 @@ -45,7 +62,7 @@ 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 -INSTALLED_VERSION=$(find /opt/ibm/wlp/usr/shared/resources/infinispan/ -name "*infinispan-commons*" -printf "%f\n" | sed 's/infinispan-commons-\(.*\).jar/\1/') +INSTALLED_VERSION=$(find /opt/ibm/wlp/usr/shared/resources/infinispan/ -name "*infinispan-commons*.jar" -printf "%f" | sed 's/infinispan-commons-\(.*\).jar/\1/') if [ -n "$INSTALLED_VERSION" ]; then - echo "[INFO] Successfully installed Infinispan client version: ${INSTALLED_VERSION}" + echo "Successfully installed Infinispan client version: ${INSTALLED_VERSION}" fi