Skip to content

Commit 1eaf449

Browse files
committed
Remove redundant changes
1 parent 5829f0b commit 1eaf449

File tree

2 files changed

+3
-52
lines changed

2 files changed

+3
-52
lines changed

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

+3-10
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,13 @@ fi
1818

1919
set -Eeox pipefail
2020

21-
pkgcmd=yum
22-
if ! command $pkgcmd
23-
then
24-
pkgcmd=microdnf
25-
fi
26-
27-
$pkgcmd update -y
28-
$pkgcmd install -y maven
21+
yum update -y
22+
yum install -y maven
2923
mkdir -p /opt/ibm/wlp/usr/shared/resources/infinispan
3024
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
3125
mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml versions:use-latest-releases -DallowMajorUpdates=false
3226
mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml dependency:copy-dependencies -DoutputDirectory=/opt/ibm/wlp/usr/shared/resources/infinispan
33-
# This fails with dependency errors using microdnf on ubi-minimal, but it is okay to let it fail
34-
yum remove -y maven || true
27+
yum remove -y maven
3528
rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml
3629
rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/jboss-transaction-api*.jar
3730
rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/reactive-streams-*.jar

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

-42
This file was deleted.

0 commit comments

Comments
 (0)