Merge pull request #293 from jmtd/OPENJDK-781-maven-openjdk17

[OPENJDK-781] maven module for openjdk17

Author: jmtd

modules/maven/8.2.3.6.8/configure.sh

@@ -4,7 +4,7 @@ set -e
 # This file is shipped by a Maven package and sets JAVA_HOME to
 # an OpenJDK-specific path. This causes problems for OpenJ9 containers
 # as the path is not correct for them.  We don't need this in any of
-# the containers because ew set JAVA_HOME in the container metadata.
+# the containers because we set JAVA_HOME in the container metadata.
 # Blank the file rather than removing it, to avoid a warning message
 # from /usr/bin/mvn.
 if [ -f /etc/java/maven.conf ]; then

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

@@ -4,7 +4,7 @@ set -e
 # This file is shipped by a Maven package and sets JAVA_HOME to
 # an OpenJDK-specific path. This causes problems for OpenJ9 containers
 # as the path is not correct for them.  We don't need this in any of
-# the containers because ew set JAVA_HOME in the container metadata.
+# the containers because we set JAVA_HOME in the container metadata.
 # Blank the file rather than removing it, to avoid a warning message
 # from /usr/bin/mvn.
 if [ -f /etc/java/maven.conf ]; then

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

@@ -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.6.3.6.17/configure.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+# This file is shipped by a Maven package and sets JAVA_HOME to
+# an OpenJDK-specific path. This causes problems for OpenJ9 containers
+# as the path is not correct for them.  We don't need this in any of
+# the containers because we set JAVA_HOME in the container metadata.
+# Blank the file rather than removing it, to avoid a warning message
+# from /usr/bin/mvn.
+if [ -f /etc/java/maven.conf ]; then
+  :> /etc/java/maven.conf
+fi

modules/maven/8.6.3.6.17/module.yaml

@@ -0,0 +1,26 @@
+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.
+
+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"
+
+modules:
+  install:
+  - name: jboss.container.maven.module
+
+packages:
+  install:
+  - maven-openjdk17
+
+execute:
+- script: configure.sh

ubi8-openjdk-11.yaml

@@ -47,9 +47,10 @@ modules:
   - name: jboss.container.prometheus
   - 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-17.yaml

@@ -46,8 +46,9 @@ modules:
     version: "17"
   - name: jboss.container.prometheus
   - name: jboss.container.maven
-    version: "8.2.3.6"
+    version: "8.6.3.6.17"
   - name: jboss.container.java.s2i.bash
+  # needed for after prometheus
   - name: jboss.container.java.singleton-jdk
 
 help: