[OPENJDK-1569] Update Maven modules to 3.8, simplify version scheme

Update all references to the 3.6 AppStream for Maven to 3.8.

Modify the version scheme used for our cekit maven modules.

The prior scheme, dating from the days when we maintained RHEL7
and RHEL8 images in the same branch, encoded a triplet of RHEL
major version; Maven version; JDK major version into a single
version string, conforming to a specification that limited us
to integers separated by '.'.

E.g.
    8.6.3.6.11 => RHEL 8.6, Maven 3.6, JDK11

Now that we are separating out image sources by RHEL major version,
we can get rid of the first part of the version string to simplify
things.

Since this commit replaces a single maven version across the whole
branch (3.6) with another (3.8), we also do not need to mention it
in the module version. Instead, just mention the JDK major version.

singleton-jdk module no longer needed for the ubi8/openjdk-17 image.

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

Author: jmtd

modules/maven/8.2.3.6.8/configure.sh renamed to modules/maven/11/configure.sh

@@ -1,17 +1,17 @@
 schema_version: 1
 name: jboss.container.maven
-version: '8.6.3.6.11'
-description: Provides Maven v3.6 capabilities to an image.
+version: '11'
+description: Provides Maven v3.8 capabilities to an image.
 
 labels:
 - name: io.fabric8.s2i.version.maven
   value: "3.6"
 
 envs:
-- name: JBOSS_CONTAINER_MAVEN_36_MODULE
-  value: /opt/jboss/container/maven/36/
+- name: JBOSS_CONTAINER_MAVEN_38_MODULE
+  value: /opt/jboss/container/maven/38/
 - name: MAVEN_VERSION
-  value: "3.6"
+  value: "3.8"
 
 modules:
   install:

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

@@ -1,22 +1,23 @@
 schema_version: 1
 name: jboss.container.maven
 # Version scheme: RHEL major . RHEL minor . Maven major . Maven minor . JDK version
-version: '8.6.3.6.17'
-description: Provides Maven v3.6 capabilities to an image.
+version: '17'
+description: Provides Maven v3.8 capabilities to an image.
 
 labels:
 - name: io.fabric8.s2i.version.maven
   value: "3.6"
 
 envs:
-- name: JBOSS_CONTAINER_MAVEN_36_MODULE
-  value: /opt/jboss/container/maven/36/
+- name: JBOSS_CONTAINER_MAVEN_38_MODULE
+  value: /opt/jboss/container/maven/38/
 - name: MAVEN_VERSION
-  value: "3.6"
+  value: '3.8'
 
 modules:
   install:
   - name: jboss.container.maven.module
+    version: '3.8'
 
 packages:
   install:

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

@@ -0,0 +1,25 @@
+schema_version: 1
+name: jboss.container.maven
+version: '8'
+description: Provides Maven v3.8 capabilities to an image.
+
+labels:
+- name: io.fabric8.s2i.version.maven
+  value: "3.8"
+
+envs:
+- name: JBOSS_CONTAINER_MAVEN_38_MODULE
+  value: /opt/jboss/container/maven/38/
+- name: MAVEN_VERSION
+  value: "3.8"
+
+modules:
+  install:
+  - name: jboss.container.maven.module
+
+packages:
+  install:
+  - maven-openjdk8
+
+execute:
+- script: configure.sh

modules/maven/8.6.3.6.17/module.yaml renamed to modules/maven/17/module.yaml

@@ -1,5 +1,5 @@
 [maven]
 name=maven
-stream=3.6
+stream=3.8
 profiles=
 state=enabled

modules/maven/8.2.3.6.8/module.yaml

@@ -1,8 +1,8 @@
 schema_version: 1
 name: jboss.container.maven.module
-version: '3.6'
+version: '3.8'
 description: ^
-  Enables the AppStream RPM Module for Maven 3.6 packages.
+  Enables the AppStream RPM Module for Maven 3.8 packages.
 
 execute:
 - script: configure.sh

modules/maven/8.6.3.6.17/configure.sh renamed to modules/maven/8/configure.sh

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