Skip to content

Commit 5c7872b

Browse files
committed
Install Maven w/o JDK25 module
Not available yet. Co-install JDK21 and forcibly remove. Refresh singleton-jdk cekit module: The alternatives workaround is no longer needed. Signed-off-by: Jonathan Dowland <[email protected]>
1 parent 8088ee9 commit 5c7872b

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

modules/singleton-jdk/configure.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,3 @@ fi
1414
# Clean up any java-* packages that have been installed that do not match
1515
# our stated JAVA_VERSION-JAVA_VENDOR (e.g.: 11-openjdk; 1.8.0-openj9)
1616
rpm -e --nodeps $(rpm -qa java-* | grep -v "^java-${JAVA_VERSION}-${JAVA_VENDOR}")
17-
18-
# workaround for <https://issues.redhat.com/browse/RHEL-3437>
19-
# The alternative link groups touched here need to match up with those set in
20-
# modules/jdk/*/configure.sh
21-
_arch="$(uname -i)"
22-
for alt in java javac java_sdk_openjdk jre_openjdk; do
23-
alternatives --set "$alt" "java-${JAVA_VERSION}-${JAVA_VENDOR}.${_arch}"
24-
done

ubi10-openjdk-25.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,9 @@ modules:
5656
- name: jboss.container.openjdk.jdk
5757
version: "25"
5858
- name: jboss.container.maven
59-
version: "3.9.25"
59+
version: "3.9.21"
6060
- name: jboss.container.java.s2i.bash
61+
- name: jboss.container.java.singleton-jdk
6162

6263
help:
6364
add: true

0 commit comments

Comments
 (0)