From c0d7ff51c67b2ecd3054cd444aba8eac80a7ccfe Mon Sep 17 00:00:00 2001
From: ilewis <idlewis@users.noreply.github.com>
Date: Fri, 7 Mar 2025 14:21:57 +0000
Subject: [PATCH 1/3] Allow infinispan setup script to run on ubi minimal

---
 .../kernel/helpers/build/infinispan-client-setup.sh | 13 ++++++++++---
 .../kernel/helpers/build/infinispan-client-setup.sh | 13 ++++++++++---
 .../kernel/helpers/build/infinispan-client-setup.sh | 13 ++++++++++---
 3 files changed, 30 insertions(+), 9 deletions(-)

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 37dcda2b5..588deb4f4 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 '<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">  <modelVersion>4.0.0</modelVersion>   <groupId>io.openliberty</groupId>  <artifactId>openliberty-infinispan-client</artifactId>  <version>1.0</version>  <!-- https://mvnrepository.com/artifact/org.infinispan/infinispan-jcache-remote -->  <dependencies>    <dependency>      <groupId>org.infinispan</groupId>      <artifactId>infinispan-jcache-remote</artifactId>      <version>10.1.3.Final</version>    </dependency>  </dependencies></project>' > /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/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 7530d1f96..ca8a36f4f 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 '<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">  <modelVersion>4.0.0</modelVersion>   <groupId>io.openliberty</groupId>  <artifactId>openliberty-infinispan-client</artifactId>  <version>1.0</version>  <!-- https://mvnrepository.com/artifact/org.infinispan/infinispan-jcache-remote -->  <dependencies>    <dependency>      <groupId>org.infinispan</groupId>      <artifactId>infinispan-jcache-remote</artifactId>      <version>10.1.3.Final</version>    </dependency>  </dependencies></project>' > /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 7530d1f96..ca8a36f4f 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 '<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">  <modelVersion>4.0.0</modelVersion>   <groupId>io.openliberty</groupId>  <artifactId>openliberty-infinispan-client</artifactId>  <version>1.0</version>  <!-- https://mvnrepository.com/artifact/org.infinispan/infinispan-jcache-remote -->  <dependencies>    <dependency>      <groupId>org.infinispan</groupId>      <artifactId>infinispan-jcache-remote</artifactId>      <version>10.1.3.Final</version>    </dependency>  </dependencies></project>' > /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 2a88adb5b28b388fc60ea5a890fb593a7dabf78c Mon Sep 17 00:00:00 2001
From: ilewis <idlewis@users.noreply.github.com>
Date: Wed, 19 Mar 2025 14:48:50 +0000
Subject: [PATCH 2/3] Remove redundant changes

---
 .../kernel/helpers/build/infinispan-client-setup.sh | 13 +++----------
 .../kernel/helpers/build/infinispan-client-setup.sh | 13 +++----------
 2 files changed, 6 insertions(+), 20 deletions(-)

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 ca8a36f4f..7530d1f96 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,20 +16,13 @@
 
 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 '<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">  <modelVersion>4.0.0</modelVersion>   <groupId>io.openliberty</groupId>  <artifactId>openliberty-infinispan-client</artifactId>  <version>1.0</version>  <!-- https://mvnrepository.com/artifact/org.infinispan/infinispan-jcache-remote -->  <dependencies>    <dependency>      <groupId>org.infinispan</groupId>      <artifactId>infinispan-jcache-remote</artifactId>      <version>10.1.3.Final</version>    </dependency>  </dependencies></project>' > /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/latest/kernel/helpers/build/infinispan-client-setup.sh b/ga/latest/kernel/helpers/build/infinispan-client-setup.sh
index ca8a36f4f..7530d1f96 100755
--- a/ga/latest/kernel/helpers/build/infinispan-client-setup.sh
+++ b/ga/latest/kernel/helpers/build/infinispan-client-setup.sh
@@ -16,20 +16,13 @@
 
 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 '<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">  <modelVersion>4.0.0</modelVersion>   <groupId>io.openliberty</groupId>  <artifactId>openliberty-infinispan-client</artifactId>  <version>1.0</version>  <!-- https://mvnrepository.com/artifact/org.infinispan/infinispan-jcache-remote -->  <dependencies>    <dependency>      <groupId>org.infinispan</groupId>      <artifactId>infinispan-jcache-remote</artifactId>      <version>10.1.3.Final</version>    </dependency>  </dependencies></project>' > /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

From c9d88291af5c7e8e7b84990f8adecea74d4b895a Mon Sep 17 00:00:00 2001
From: ilewis <idlewis@users.noreply.github.com>
Date: Fri, 11 Apr 2025 11:28:42 +0100
Subject: [PATCH 3/3] Add 25.0.0.3 changes

---
 .../kernel/helpers/build/infinispan-client-setup.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

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 7530d1f96..ca8a36f4f 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 '<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">  <modelVersion>4.0.0</modelVersion>   <groupId>io.openliberty</groupId>  <artifactId>openliberty-infinispan-client</artifactId>  <version>1.0</version>  <!-- https://mvnrepository.com/artifact/org.infinispan/infinispan-jcache-remote -->  <dependencies>    <dependency>      <groupId>org.infinispan</groupId>      <artifactId>infinispan-jcache-remote</artifactId>      <version>10.1.3.Final</version>    </dependency>  </dependencies></project>' > /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