Merge remote-tracking branch 'origin/ubi9' into jlink-dev

Author: jmtd

modules/jdk/17/artifacts/jvm-options renamed to modules/jdk/17/artifacts/opt/jboss/container/openjdk/jdk/jvm-options

@@ -2,6 +2,11 @@
 # Configure module
 set -e
 
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+install -m 0644 -D {${ARTIFACTS_DIR},}/opt/jboss/container/openjdk/jdk/jvm-options
+
 # Set this JDK as the alternative in use
 _arch="$(uname -i)"
 alternatives --set java java-17-openjdk.${_arch}

modules/jdk/17/configure.sh

@@ -33,7 +33,3 @@ modules:
 
 execute:
 - script: configure.sh
-
-artifacts:
-  - path: artifacts/jvm-options
-    dest: /opt/jboss/container/openjdk/jdk

modules/jdk/17/module.yaml

@@ -2,6 +2,11 @@
 # Configure module
 set -e
 
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+install -m 0644 -D {${ARTIFACTS_DIR},}/opt/jboss/container/openjdk/jdk/jvm-options
+
 # Set this JDK as the alternative in use
 _arch="$(uname -i)"
 alternatives --set java java-21-openjdk.${_arch}

modules/jdk/21/artifacts/jvm-options renamed to modules/jdk/21/artifacts/opt/jboss/container/openjdk/jdk/jvm-options

@@ -33,7 +33,3 @@ modules:
 
 execute:
 - script: configure.sh
-
-artifacts:
-  - path: artifacts/jvm-options
-    dest: /opt/jboss/container/openjdk/jdk

modules/jdk/21/configure.sh

@@ -5,13 +5,7 @@ set -e
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
-chown -R $USER:root $SCRIPT_DIR
-chmod -R ug+rwX $SCRIPT_DIR
-chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jdk/*
-
-pushd ${ARTIFACTS_DIR}
-cp -pr * /
-popd
+install -m 0644 -D {${ARTIFACTS_DIR},}/opt/jboss/container/openjdk/jdk/jvm-options
 
 # Set this JDK as the alternative in use
 _arch="$(uname -i)"

modules/jdk/21/module.yaml

@@ -1,5 +1,10 @@
-#!/bin/sh
-set -e
+#!/bin/bash
+set -euo pipefail
+
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+install -m 0644 -D {${ARTIFACTS_DIR},}/opt/jboss/container/openjdk/jre/jvm-options
 
 # Set this JDK as the alternative in use
 _arch="$(uname -i)"

modules/jdk/8/configure.sh

@@ -33,7 +33,3 @@ modules:
 
 execute:
 - script: configure.sh
-
-artifacts:
-  - path: artifacts/jvm-options
-    dest: /opt/jboss/container/openjdk/jre