Revert "Merge pull request #401 from Josh-Matsuoka/ubi9-jlink"

This reverts commit 249397b, reversing
changes made to 4bc78f0.

Author: jmtd

modules/jdk/11/module.yaml

@@ -25,7 +25,6 @@ envs:
 packages:
   install:
   - java-11-openjdk-devel
-  - java-11-openjdk-jmods
   - tzdata-java
 
 modules:

modules/jdk/17/module.yaml

@@ -25,7 +25,6 @@ envs:
 packages:
   install:
   - java-17-openjdk-devel
-  - java-17-openjdk-jmods
 
 modules:
   install:

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

@@ -22,19 +22,101 @@ 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
 
-  # Load JAVA_APP_JAR and JAVA_LIB_DIR
-  if [ -f "${JBOSS_CONTAINER_UTIL_PATHFINDER_MODULE}/pathfinder.sh" ]; then
-    source "$JBOSS_CONTAINER_UTIL_PATHFINDER_MODULE/pathfinder.sh"
-    setup_java_app_and_lib
+  # Check also $JAVA_APP_DIR. Overrides other defaults
+  # It's valid to set the app dir in the default script
+  if [ -z "${JAVA_APP_DIR}" ]; then
+    # XXX: is this correct?  This is defaulted above to /deployments.  Should we
+    # define a default to the old /opt/java-run?
+    JAVA_APP_DIR="${JBOSS_CONTAINER_JAVA_RUN_MODULE}"
+  else
+    if [ -f "${JAVA_APP_DIR}/${run_env_sh}" ]; then
+      source "${JAVA_APP_DIR}/${run_env_sh}"
+    fi
+  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
 }
 

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

@@ -14,24 +14,3 @@ source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/maven-s2i-overrides"
 # invoke the build
 maven_s2i_build
 
-# run the pathfinder scripts to define JAVA_APP_JAR and JAVA_LIB_DIR
-source "${JBOSS_CONTAINER_UTIL_PATHFINDER_MODULE}/pathfinder.sh"
-echo "Setting up java app and lib variables"
-setup_java_app_and_lib
-
-# include our jlink scripts
-source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkdeps.sh"
-echo "Invoking mkdeps"
-generate_deps
-
-source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkstrippeddeps.sh"
-echo "Stripping dependencies"
-mkstrippeddeps
-
-source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/generatejdkdeps.sh"
-echo "Generating JDK dependencies"
-generatejdkdeps
-
-source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkjreimage.sh"
-echo "Linking jre"
-generate_jre_image