Rename maven module for OpenJDK 11 to be explicit

The "maven" module version 8.2.3.6 installed the "maven" RPM, pulling
in whatever the default system JDK is implicitly.

Align the module with the other two, by re-versioning it to 8.6.3.6.11
(+ .11 suffix for JDK 11, change 8.2 → 8.6 to reflect the RHEL minor
version where we are implementing this) and depending explicitly on
maven-openjdk11.

depend on this module in ubi8-openjdk-11.yaml, and remove singleton-jdk
which should not be necessary.

Signed-off-by: Jonathan Dowland <[email protected]>

Author: jmtd

modules/maven/8.2.3.6/configure.sh renamed to modules/maven/8.6.3.6.11/configure.sh

@@ -1,6 +1,6 @@
 schema_version: 1
 name: jboss.container.maven
-version: '8.2.3.6'
+version: '8.6.3.6.11'
 description: Provides Maven v3.6 capabilities to an image.
 
 labels:
@@ -19,7 +19,7 @@ modules:
 
 packages:
   install:
-  - maven
+  - maven-openjdk11
 
 execute:
 - script: configure.sh

modules/maven/8.2.3.6/module.yaml renamed to modules/maven/8.6.3.6.11/module.yaml

@@ -48,9 +48,10 @@ modules:
     version: "8.6.11"
   - name: jboss.container.jolokia
   - name: jboss.container.maven
-    version: "8.2.3.6"
+    version: "8.6.3.6.11"
   - name: jboss.container.util.nss-wrapper
   - name: jboss.container.java.s2i.bash
+  # required due to jolokia
   - name: jboss.container.java.singleton-jdk
 
 help:

ubi8-openjdk-11.yaml

@@ -49,6 +49,8 @@ modules:
   - name: jboss.container.maven
     version: "8.6.3.6.17"
   - name: jboss.container.java.s2i.bash
+  # needed for after prometheus
+  - name: jboss.container.java.singleton-jdk
 
 help:
   add: true