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]>

Author: jmtd

modules/singleton-jdk/configure.sh

@@ -14,11 +14,3 @@ fi
 # Clean up any java-* packages that have been installed that do not match
 # our stated JAVA_VERSION-JAVA_VENDOR (e.g.: 11-openjdk; 1.8.0-openj9)
 rpm -e --nodeps $(rpm -qa java-* | grep -v "^java-${JAVA_VERSION}-${JAVA_VENDOR}")
-
-# workaround for <https://issues.redhat.com/browse/RHEL-3437>
-# The alternative link groups touched here need to match up with those set in
-# modules/jdk/*/configure.sh
-_arch="$(uname -i)"
-for alt in java javac java_sdk_openjdk jre_openjdk; do
-  alternatives --set "$alt" "java-${JAVA_VERSION}-${JAVA_VENDOR}.${_arch}"
-done

ubi10-openjdk-25.yaml

@@ -56,8 +56,9 @@ modules:
   - name: jboss.container.openjdk.jdk
     version: "25"
   - name: jboss.container.maven
-    version: "3.9.25"
+    version: "3.9.21"
   - name: jboss.container.java.s2i.bash
+  - name: jboss.container.java.singleton-jdk
 
 help:
   add: true