[OPENJDK-4002] merge down jlink-dev branch (take 2)

modules/jlink/artifacts/opt/jboss/container/java/jlink/generatejdkdeps.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+function generatejdkdeps() {
+  echo "Generating JDK deps"
+  $JAVA_HOME/bin/java --list-modules > $S2I_JLINK_TEMP_PATH/java-modules.txt
+  < $S2I_JLINK_TEMP_PATH/java-modules.txt sed "s/\\@.*//" > $S2I_JLINK_TEMP_PATH/modules.txt
+  grep -Fx -f $S2I_JLINK_TEMP_PATH/stripped-deps.txt $S2I_JLINK_TEMP_PATH/modules.txt | tr '\n' ',' | tr -d "[:space:]" > $S2I_JLINK_TEMP_PATH/module-deps.txt
+  echo "jdk.zipfs" >> $S2I_JLINK_TEMP_PATH/module-deps.txt
+}

modules/jlink/artifacts/opt/jboss/container/java/jlink/mkdeps.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+set -euo pipefail
+shopt -s globstar
+
+function generate_deps() {
+  # Create a temporary directory for a module path
+  # This works around "Module java.xml.bind not found, required by java.ws.rs"
+  mkdir dependencies
+
+  if [[ -v JAVA_LIB_DIR ]]; then
+      # Serially copy all library JARsinto a flat directory. Serially as we may
+      # have multiple libs with the same name; in which case, we clobber all but
+      # one rather than fail the script
+      find $JAVA_LIB_DIR -type f -name '*.jar' -exec cp -vt dependencies {} \;
+
+      echo "Working with: "
+      echo $JAVA_APP_JAR
+      echo $JAVA_LIB_DIR
+      # generate the dependency list
+      $JAVA_HOME/bin/jdeps --multi-release $JAVA_VERSION -R -s \
+        --module-path dependencies \
+        "$JAVA_APP_JAR" \
+        "$JAVA_LIB_DIR"/**/*.jar \
+        > $S2I_JLINK_TEMP_PATH/deps.txt
+  else 
+    $JAVA_HOME/bin/jdeps --multi-release $JAVA_VERSION -R -s \
+      --module-path dependencies \
+      "$JAVA_APP_JAR" \
+      > $S2I_JLINK_TEMP_PATH/deps.txt
+    cat $S2I_JLINK_TEMP_PATH/deps.txt
+  fi
+}

modules/jlink/artifacts/opt/jboss/container/java/jlink/mkjreimage.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+# TODO: Still Needed?
+set -euo pipefail
+
+depsfile="$S2I_JLINK_TEMP_PATH/module-deps.txt"
+
+function generate_jre_image() {
+	test -f $depsfile
+	modules="$(cat $depsfile)"
+
+	$JAVA_HOME/bin/jlink --output "$S2I_JLINK_OUTPUT_PATH" \
+    	   	--add-modules "$modules" \
+		--strip-debug --no-header-files --no-man-pages \
+		--compress=2
+}

modules/jlink/artifacts/opt/jboss/container/java/jlink/mkstrippeddeps.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -euo pipefail
+
+function mkstrippeddeps() {
+  if [ -f "$S2I_JLINK_TEMP_PATH/deps.txt" ]; then 
+    echo "deps exists, filtering"
+    < $S2I_JLINK_TEMP_PATH/deps.txt \
+      grep 'java\|jdk\.'  | # mostly removes target/, but also jdk8internals
+      sed -E "s/Warning: .*//" | #remove extraneous warnings
+      sed -E "s/.*-> //"  | # remove src of src -> dep
+      sed -E "s/.*\.jar//" | # remove extraneous dependencies
+      sed "s#/.*##"       | # delete anything after a slash. in practice target/..
+      sort | uniq |
+      tee $S2I_JLINK_TEMP_PATH/stripped-deps.txt
+    echo "Stripping dependencies complete"
+  else
+    echo "deps does not exist"
+  fi
+}

modules/jlink/artifacts/opt/jboss/container/java/jlink/preflight.sh

@@ -0,0 +1,25 @@
+jlink_techpreview_warning()
+{
+  {
+    echo "WARNING WARNING WARNING"
+    echo "        Jlink integration is a Tech Preview feature!"
+    echo "        See <https://access.redhat.com/support/offerings/techpreview/>"
+    echo "        for more information."
+    echo "WARNING WARNING WARNING"
+  } >&2
+}
+
+jlink_preflight_check()
+{
+    # preflight check: do we have what we need?
+    if [ "$JAVA_VERSION" -lt 11 ]; then
+      echo "Jlink integration not available for JDK${JAVA_VERSION}!"
+      echo "Jlink integration is only supported for JDK versions 11 and newer."
+      exit 1
+    fi
+    if [ ! -d /usr/lib/jvm/java/jmods ]; then
+      echo "Jlink integration requires the jmods RPM to be installed in the builder image, e.g."
+      echo "        microdnf install -y java-${JAVA_VERSION}-openjdk-jmods"
+      exit 1
+    fi
+}

modules/jlink/configure.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+# Configure module
+set -e
+
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+chown -R default:root $SCRIPT_DIR
+chmod -R ug+rwX $SCRIPT_DIR
+chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/java/jlink/*
+
+pushd ${ARTIFACTS_DIR}
+cp -pr * /
+popd

modules/jlink/module.yaml

@@ -0,0 +1,32 @@
+schema_version: 1
+
+name: "jboss.container.java.jlink"
+version: "2.0"
+description: ^
+  "Provides support for building custom JREs with a slimmed
+  down set of modules by making use of Jdeps and Jlink"
+
+execute:
+- script: configure.sh
+
+envs: 
+- name: JBOSS_CONTAINER_JAVA_JLINK_MODULE
+  value: /opt/jboss/container/java/jlink
+- name: S2I_JLINK_OUTPUT_PATH
+  value: /tmp/jre
+- name: S2I_JLINK_TEMP_PATH
+  value: /tmp/jlink
+- name: S2I_ENABLE_JLINK
+  description: ^
+    Enables the Jdeps/JLink workflow to minimize JRE size
+  example: "false"
+
+modules:
+  install: 
+  - name: jboss.container.java.run
+  - name: jboss.container.util.pathfinder
+
+packages:
+  install:
+  - binutils # for objcopy
+  - java-21-openjdk-jmods

modules/jlink/tests/features/jlink.feature

@@ -0,0 +1,36 @@
+@openjdk-tech-preview/openjdk-21-jlink-rhel9
+Feature: Openshift OpenJDK S2I tests (jlink specific)
+
+  Scenario: tech preview warning is printed (OPENJDK-3038)
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications from spring-boot-sample-simple/target using master
+       | variable            | value        |
+       | S2I_ENABLE_JLINK    | true         |
+      Then s2i build log should contain Jlink integration is a Tech Preview feature
+
+Scenario: Ensure S2I_ENABLE_JLINK is not set to true
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications from spring-boot-sample-simple/target using master
+     Then s2i build log should not contain Jlink integration is a Tech Preview feature
+      And file /tmp/jre should not exist
+
+Scenario: Check that /tmp/jre/bin/java and /tmp/jre/lib/modules exist post s2i build if jlink is enabled.
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications from quarkus-quickstarts/getting-started-3.9.2-uberjar
+       | variable            | value        |
+       | S2I_ENABLE_JLINK    | true         |
+      Then file /tmp/jre/bin/java should exist and be a file
+       And file /tmp/jre/lib/modules should exist and be a file
+
+Scenario: Check that /tmp/jlink is deleted when S2I_DELETE_SOURCE is set
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications from quarkus-quickstarts/getting-started-3.9.2-uberjar
+       | variable            | value        |
+       | S2I_ENABLE_JLINK    | true         |
+       | S2I_DELETE_SOURCE   | true         |
+      Then s2i build log should contain Cleaning up temporary file directory /tmp/jlink
+       And file /tmp/jlink should not exist
+
+Scenario: Check that /tmp/jlink is not deleted when S2I_DELETE_SOURCE is set to false
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications from quarkus-quickstarts/getting-started-3.9.2-uberjar
+       | variable            | value        |
+       | S2I_ENABLE_JLINK    | true         |
+       | S2I_DELETE_SOURCE   | false         |
+      Then s2i build log should not contain Cleaning up temporary file directory /tmp/jlink
+       And file /tmp/jlink should exist

modules/jvm/tests/features/memory.feature

@@ -36,6 +36,7 @@ Feature: OPENJDK-559 JVM Memory tests
   @ubi9/openjdk-11
   @ubi9/openjdk-17
   @ubi9/openjdk-21
+  @openjdk-tech-preview/openjdk-21-jlink-rhel9
   Scenario: Ensure Maven doesn't use MaxRAMPercentage=80
     Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from spring-boot-sample-simple
     Then s2i build log should match regex INFO Using MAVEN_OPTS.*-XX:MaxRAMPercentage=25.0$

modules/jvm/tests/features/runtime.feature

@@ -1,6 +1,7 @@
 @ubi9/openjdk-11
 @ubi9/openjdk-17
 @ubi9/openjdk-21
+@openjdk-tech-preview/openjdk-21-jlink-rhel9
 Feature: Openshift OpenJDK Runtime tests
 
   @ubi9

modules/maven/s2i/tests/features/java_s2i.feature

@@ -3,6 +3,7 @@
 @ubi9/openjdk-11
 @ubi9/openjdk-17
 @ubi9/openjdk-21
+@openjdk-tech-preview/openjdk-21-jlink-rhel9
 Feature: Openshift OpenJDK S2I tests
 # NOTE: these tests should be usable with the other images once we have refactored the JDK scripts.
 # These builds do not actually run maven. This is important, because the proxy

modules/maven/s2i/tests/features/java_s2i_inc.feature

@@ -1,6 +1,7 @@
 @ubi9/openjdk-11
 @ubi9/openjdk-17
 @ubi9/openjdk-21
+@openjdk-tech-preview/openjdk-21-jlink-rhel9
 Feature: Openshift OpenJDK S2I tests
 
   # test incremental builds

modules/run/artifacts/opt/jboss/container/java/run/run-java.sh

@@ -5,13 +5,15 @@ set -eo pipefail
 
 export JBOSS_CONTAINER_UTIL_LOGGING_MODULE="${JBOSS_CONTAINER_UTIL_LOGGING_MODULE-/opt/jboss/container/util/logging}"
 export JBOSS_CONTAINER_JAVA_RUN_MODULE="${JBOSS_CONTAINER_JAVA_RUN_MODULE-/opt/jboss/container/java/run}"
+export JBOSS_CONTAINER_UTIL_PATHFINDER_MODULE="${JBOSS_CONTAINER_UTIL_PATHFINDER_MODULE-/opt/jboss/container/util/pathfinder}"
 
 # Default the application dir to the S2I deployment dir
 if [ -z "$JAVA_APP_DIR" ]
   then JAVA_APP_DIR=/deployments
 fi
 
 source "$JBOSS_CONTAINER_UTIL_LOGGING_MODULE/logging.sh"
+source "$JBOSS_CONTAINER_UTIL_PATHFINDER_MODULE/pathfinder.sh"
 
 # ==========================================================
 # Generic run script for running arbitrary Java applications
@@ -30,99 +32,6 @@ check_error() {
   fi
 }
 
-# detect Quarkus fast-jar package type (OPENJDK-631)
-is_quarkus_fast_jar() {
-  if test -f quarkus-app/quarkus-run.jar; then
-    log_info "quarkus fast-jar package type detected"
-    echo quarkus-app/quarkus-run.jar
-    return 0
-  else
-    return 1
-  fi
-}
-
-# Try hard to find a sane default jar-file
-auto_detect_jar_file() {
-  local dir=$1
-
-  # Filter out temporary jars from the shade plugin which start with 'original-'
-  local old_dir=$(pwd)
-  cd ${dir}
-  if [ $? = 0 ]; then
-
-    if quarkus="$(is_quarkus_fast_jar)"; then
-      echo "$quarkus"
-      return
-    fi
-
-    local nr_jars=`ls *.jar 2>/dev/null | grep -v '^original-' | wc -l | tr -d '[[:space:]]'`
-    if [ ${nr_jars} = 1 ]; then
-      ls *.jar | grep -v '^original-'
-      exit 0
-    fi
-
-    log_error "Neither \$JAVA_MAIN_CLASS nor \$JAVA_APP_JAR is set and ${nr_jars} JARs found in ${dir} (1 expected)"
-    cd ${old_dir}
-  else
-    log_error "No directory ${dir} found for auto detection"
-  fi
-}
-
-# Check directories (arg 2...n) for a jar file (arg 1)
-get_jar_file() {
-  local jar=$1
-  shift;
-
-  if [ "${jar:0:1}" = "/" ]; then
-    if [ -f "${jar}" ]; then
-      echo "${jar}"
-    else
-      log_error "No such file ${jar}"
-    fi
-  else
-    for dir in $*; do
-      if [ -f "${dir}/$jar" ]; then
-        echo "${dir}/$jar"
-        return
-      fi
-    done
-    log_error "No ${jar} found in $*"
-  fi
-}
-
-load_env() {
-  # Configuration stuff is read from this file
-  local run_env_sh="run-env.sh"
-
-  # Load default default config
-  if [ -f "${JBOSS_CONTAINER_JAVA_RUN_MODULE}/${run_env_sh}" ]; then
-    source "${JBOSS_CONTAINER_JAVA_RUN_MODULE}/${run_env_sh}"
-  fi
-
-  # Check also $JAVA_APP_DIR. Overrides other defaults
-  # It's valid to set the app dir in the default script
-  if [ -f "${JAVA_APP_DIR}/${run_env_sh}" ]; then
-      source "${JAVA_APP_DIR}/${run_env_sh}"
-  fi
-
-  export JAVA_APP_DIR
-
-  # JAVA_LIB_DIR defaults to JAVA_APP_DIR
-  export JAVA_LIB_DIR="${JAVA_LIB_DIR:-${JAVA_APP_DIR}}"
-  if [ -z "${JAVA_MAIN_CLASS}" ] && [ -z "${JAVA_APP_JAR}" ]; then
-    JAVA_APP_JAR="$(auto_detect_jar_file ${JAVA_APP_DIR})"
-    check_error "${JAVA_APP_JAR}"
-  fi
-
-  if [ "x${JAVA_APP_JAR}" != x ]; then
-    local jar="$(get_jar_file ${JAVA_APP_JAR} ${JAVA_APP_DIR} ${JAVA_LIB_DIR})"
-    check_error "${jar}"
-    export JAVA_APP_JAR=${jar}
-  else
-    export JAVA_MAIN_CLASS
-  fi
-}
-
 # Combine all java options
 get_java_options() {
   local jvm_opts
@@ -226,7 +135,8 @@ mask_passwords() {
 # Start JVM
 startup() {
   # Initialize environment
-  load_env
+  # populates JAVA_APP_JAR and JAVA_LIB_DIR and possibly JAVA_MAIN_CLASS
+  setup_java_app_and_lib
 
   local args
   cd ${JAVA_APP_DIR}

modules/run/module.yaml

@@ -59,3 +59,4 @@ modules:
   - name: jboss.container.user
   - name: jboss.container.java.jvm
   - name: jboss.container.util.logging
+  - name: jboss.container.util.pathfinder

modules/run/tests/features/java.security.feature

@@ -1,6 +1,7 @@
 @ubi9/openjdk-11
 @ubi9/openjdk-17
 @ubi9/openjdk-21
+@openjdk-tech-preview/openjdk-21-jlink-rhel9
 Feature: Openshift S2I tests
   Scenario: Check networkaddress.cache.negative.ttl has been set correctly
     Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from binary-cli-security-property