From 5829f0b7129c9950aead682eef1d5cbac3baf723 Mon Sep 17 00:00:00 2001 From: ilewis Date: Wed, 12 Mar 2025 10:01:34 +0000 Subject: [PATCH 1/2] Allow infinispan setup script to run on ubi minimal --- .../helpers/build/infinispan-client-setup.sh | 13 ++++-- .../helpers/build/infinispan-client-setup.sh | 42 +++++++++++++++++++ .../helpers/build/infinispan-client-setup.sh | 13 ++++-- .../helpers/build/infinispan-client-setup.sh | 13 ++++-- 4 files changed, 72 insertions(+), 9 deletions(-) create mode 100755 ga/24.0.0.9/kernel/helpers/build/infinispan-client-setup.sh diff --git a/ga/24.0.0.12/kernel/helpers/build/infinispan-client-setup.sh b/ga/24.0.0.12/kernel/helpers/build/infinispan-client-setup.sh index 37dcda2b..588deb4f 100755 --- a/ga/24.0.0.12/kernel/helpers/build/infinispan-client-setup.sh +++ b/ga/24.0.0.12/kernel/helpers/build/infinispan-client-setup.sh @@ -18,13 +18,20 @@ fi set -Eeox pipefail -yum update -y -yum install -y maven +pkgcmd=yum +if ! command $pkgcmd +then + pkgcmd=microdnf +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 mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml dependency:copy-dependencies -DoutputDirectory=/opt/ibm/wlp/usr/shared/resources/infinispan -yum remove -y maven +# 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 diff --git a/ga/24.0.0.9/kernel/helpers/build/infinispan-client-setup.sh b/ga/24.0.0.9/kernel/helpers/build/infinispan-client-setup.sh new file mode 100755 index 00000000..588deb4f --- /dev/null +++ b/ga/24.0.0.9/kernel/helpers/build/infinispan-client-setup.sh @@ -0,0 +1,42 @@ +#!/bin/bash +# (C) Copyright IBM Corporation 2020. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# 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. +if [ "$VERBOSE" != "true" ]; then + exec >/dev/null +fi + +set -Eeox pipefail + +pkgcmd=yum +if ! command $pkgcmd +then + pkgcmd=microdnf +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 +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 +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 -rf ~/.m2 +chown -R 1001:0 /opt/ibm/wlp/usr/shared/resources/infinispan +chmod -R g+rw /opt/ibm/wlp/usr/shared/resources/infinispan + diff --git a/ga/25.0.0.3/kernel/helpers/build/infinispan-client-setup.sh b/ga/25.0.0.3/kernel/helpers/build/infinispan-client-setup.sh index 7530d1f9..ca8a36f4 100755 --- a/ga/25.0.0.3/kernel/helpers/build/infinispan-client-setup.sh +++ b/ga/25.0.0.3/kernel/helpers/build/infinispan-client-setup.sh @@ -16,13 +16,20 @@ set -Eeox pipefail -yum update -y -yum install -y maven +pkgcmd=yum +if ! command $pkgcmd +then + pkgcmd=microdnf +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 mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml dependency:copy-dependencies -DoutputDirectory=/opt/ibm/wlp/usr/shared/resources/infinispan -yum remove -y maven +# 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 diff --git a/ga/latest/kernel/helpers/build/infinispan-client-setup.sh b/ga/latest/kernel/helpers/build/infinispan-client-setup.sh index 7530d1f9..ca8a36f4 100755 --- a/ga/latest/kernel/helpers/build/infinispan-client-setup.sh +++ b/ga/latest/kernel/helpers/build/infinispan-client-setup.sh @@ -16,13 +16,20 @@ set -Eeox pipefail -yum update -y -yum install -y maven +pkgcmd=yum +if ! command $pkgcmd +then + pkgcmd=microdnf +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 mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml dependency:copy-dependencies -DoutputDirectory=/opt/ibm/wlp/usr/shared/resources/infinispan -yum remove -y maven +# 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 From 1eaf44915cb9b8c5513980cedbd77a68c8370514 Mon Sep 17 00:00:00 2001 From: ilewis Date: Wed, 19 Mar 2025 10:27:45 +0000 Subject: [PATCH 2/2] Remove redundant changes --- .../helpers/build/infinispan-client-setup.sh | 13 ++---- .../helpers/build/infinispan-client-setup.sh | 42 ------------------- 2 files changed, 3 insertions(+), 52 deletions(-) delete mode 100755 ga/24.0.0.9/kernel/helpers/build/infinispan-client-setup.sh diff --git a/ga/24.0.0.12/kernel/helpers/build/infinispan-client-setup.sh b/ga/24.0.0.12/kernel/helpers/build/infinispan-client-setup.sh index 588deb4f..37dcda2b 100755 --- a/ga/24.0.0.12/kernel/helpers/build/infinispan-client-setup.sh +++ b/ga/24.0.0.12/kernel/helpers/build/infinispan-client-setup.sh @@ -18,20 +18,13 @@ fi set -Eeox pipefail -pkgcmd=yum -if ! command $pkgcmd -then - pkgcmd=microdnf -fi - -$pkgcmd update -y -$pkgcmd install -y maven +yum update -y +yum 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 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 +yum remove -y maven 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 diff --git a/ga/24.0.0.9/kernel/helpers/build/infinispan-client-setup.sh b/ga/24.0.0.9/kernel/helpers/build/infinispan-client-setup.sh deleted file mode 100755 index 588deb4f..00000000 --- a/ga/24.0.0.9/kernel/helpers/build/infinispan-client-setup.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -# (C) Copyright IBM Corporation 2020. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# 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. -if [ "$VERBOSE" != "true" ]; then - exec >/dev/null -fi - -set -Eeox pipefail - -pkgcmd=yum -if ! command $pkgcmd -then - pkgcmd=microdnf -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 -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 -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 -rf ~/.m2 -chown -R 1001:0 /opt/ibm/wlp/usr/shared/resources/infinispan -chmod -R g+rw /opt/ibm/wlp/usr/shared/resources/infinispan -