[OPENJDK-1569] use {mvn}.{jdk} version for maven modules

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

Author: jmtd

modules/maven/11/module.yaml

@@ -1,11 +1,11 @@
 schema_version: 1
 name: jboss.container.maven
-version: '11'
+version: '3.8.11'
 description: Provides Maven v3.8 capabilities to an image.
 
 labels:
 - name: io.fabric8.s2i.version.maven
-  value: "3.6"
+  value: "3.8"
 
 envs:
 - name: JBOSS_CONTAINER_MAVEN_38_MODULE

modules/maven/17/module.yaml

@@ -1,12 +1,11 @@
 schema_version: 1
 name: jboss.container.maven
-# Version scheme: RHEL major . RHEL minor . Maven major . Maven minor . JDK version
-version: '17'
+version: '3.8.17'
 description: Provides Maven v3.8 capabilities to an image.
 
 labels:
 - name: io.fabric8.s2i.version.maven
-  value: "3.6"
+  value: "3.8"
 
 envs:
 - name: JBOSS_CONTAINER_MAVEN_38_MODULE
@@ -17,7 +16,6 @@ envs:
 modules:
   install:
   - name: jboss.container.maven.module
-    version: '3.8'
 
 packages:
   install:

modules/maven/8/module.yaml

@@ -1,6 +1,6 @@
 schema_version: 1
 name: jboss.container.maven
-version: '8'
+version: '3.8.8'
 description: Provides Maven v3.8 capabilities to an image.
 
 labels:

ubi8-openjdk-11.yaml

@@ -47,7 +47,7 @@ modules:
     version: "8.6.11"
   - name: jboss.container.jolokia
   - name: jboss.container.maven
-    version: "11"
+    version: "3.8.11"
   - name: jboss.container.java.s2i.bash
   - name: jboss.container.util.pkg-update
   # required due to jolokia

ubi8-openjdk-17.yaml

@@ -46,7 +46,7 @@ modules:
   - name: jboss.container.prometheus
     version: "8.6.17"
   - name: jboss.container.maven
-    version: "17"
+    version: "3.8.17"
   - name: jboss.container.java.s2i.bash
   - name: jboss.container.util.pkg-update
 

ubi8-openjdk-8.yaml

@@ -47,7 +47,7 @@ modules:
     version: "8.6.8"
   - name: jboss.container.jolokia
   - name: jboss.container.maven
-    version: "8"
+    version: "3.8.8"
   - name: jboss.container.java.s2i.bash
   - name: jboss.container.util.pkg-update