Refactor Maven, add maven-openjdk8 module

jboss-maven/module.yaml

@@ -5,5 +5,5 @@ description: Legacy Maven module
 
 modules:
   install:
-  - name: jboss.container.maven.default.bash
+  - name: jboss.container.maven.default
 

jboss/container/java/s2i/bash/module.yaml

@@ -14,7 +14,7 @@ execute:
 
 modules:
   install:
-  - name: jboss.container.maven.s2i.bash
+  - name: jboss.container.maven.s2i
   - name: jboss.container.java.run.bash
   - name: jboss.container.jolokia
   - name: jboss.container.prometheus

jboss/container/jws/s2i/bash/module.yaml

@@ -14,5 +14,5 @@ execute:
 
 modules:
   install:
-  - name: jboss.container.maven.s2i.bash
+  - name: jboss.container.maven.s2i
   - name: jboss.container.util.logging.bash

jboss/container/maven/35/35scl/module.yaml → jboss/container/maven/7.0.3.5/module.yaml

@@ -1,6 +1,6 @@
 schema_version: 1
-name: jboss.container.maven.35.bash
-version: '3.5scl'
+name: jboss.container.maven
+version: '7.0.3.5'
 description: Provides Maven v3.5 capabilities to an image via SCL
 
 labels:

jboss/container/maven/36/36scl/module.yaml → jboss/container/maven/7.0.3.6/module.yaml

@@ -1,6 +1,6 @@
 schema_version: 1
-name: jboss.container.maven.36.bash
-version: '3.6scl'
+name: jboss.container.maven
+version: '7.0.3.6'
 description: Provides Maven v3.6 capabilities to an image via SCL
 
 labels:

jboss/container/maven/35/default/module.yaml → jboss/container/maven/8.0.3.5/module.yaml

@@ -1,6 +1,6 @@
 schema_version: 1
-name: jboss.container.maven.35.bash
-version: '3.5'
+name: jboss.container.maven
+version: '8.0.3.5'
 description: Provides Maven v3.5 capabilities to an image.
 
 labels:

jboss/container/maven/8.2.3.6.8/configure.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+dnf module enable -y maven:3.6
+dnf install -y --setopt=tsflags=nodocs maven-openjdk8
+dnf clean all

jboss/container/maven/8.2.3.6.8/module.yaml

@@ -0,0 +1,18 @@
+schema_version: 1
+name: jboss.container.maven
+# Version scheme: RHEL major . RHEL minor . Maven major . Maven minor . JDK version
+version: '8.2.3.6.8'
+description: Provides Maven v3.6 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: MAVEN_VERSION
+  value: "3.6"
+
+execute:
+- script: configure.sh

jboss/container/maven/36/default/module.yaml → jboss/container/maven/8.2.3.6/module.yaml

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