Merge pull request #345 from jmtd/OPENJDK-1569-maven-3.8

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

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: '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_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

@@ -0,0 +1,25 @@
+schema_version: 1
+name: jboss.container.maven
+version: '3.8.17'
+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-openjdk17
+
+execute:
+- script: configure.sh

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: '3.8.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/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