Re-add files from a bad automerge.

Author: sefroberg

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 > java-modules.txt
+  < java-modules.txt sed "s/\\@.*//" > modules.txt
+  grep -Fx -f stripped-deps.txt modules.txt | tr '\n' ',' | tr -d "[:space:]" > module-deps.txt
+  echo "jdk.zipfs" >> module-deps.txt
+}

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

@@ -0,0 +1,15 @@
+#!/bin/bash
+# TODO: Still Needed?
+set -euo pipefail
+
+depsfile="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 "deps.txt" ]; then 
+    echo "deps exists, filtering"
+    <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 stripped-deps.txt
+    echo "Stripping dependencies complete"
+  else
+    echo "deps does not exist"
+  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,25 @@
+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
+
+modules:
+  install: 
+  - name: jboss.container.java.run
+  - name: jboss.container.util.pathfinder
+
+packages:
+  install:
+  - binutils # for objcopy

modules/s2i/bash/module.yaml

@@ -16,6 +16,8 @@ modules:
   - name: jboss.container.maven.s2i
   - name: jboss.container.java.run
   - name: jboss.container.util.logging
+  - name: jboss.container.java.jlink
+  - name: jboss.container.util.pathfinder
 
 packages:
   install:

modules/s2i/core/artifacts/opt/jboss/container/s2i/core/s2i-core

@@ -33,6 +33,7 @@ function s2i_core_env_init() {
   S2I_IMAGE_SOURCE_MOUNTS="${S2I_IMAGE_SOURCE_MOUNTS:-${CUSTOM_INSTALL_DIRECTORIES}}"
   S2I_ENABLE_INCREMENTAL_BUILDS="${S2I_ENABLE_INCREMENTAL_BUILDS:-true}"
   S2I_DELETE_SOURCE="${S2I_DELETE_SOURCE:-true}"
+  S2I_ENABLE_JLINK="${S2I_ENABLE_JLINK:-false}"
 }
 
 # extensions may override this method to initialize environment variables
@@ -88,11 +89,13 @@ function s2i_core_copy_deployments() {
       if [ ! -d "${S2I_TARGET_DEPLOYMENTS_DIR}" ]; then
         log_info "S2I_TARGET_DEPLOYMENTS_DIR does not exist, creating ${S2I_TARGET_DEPLOYMENTS_DIR}"
         mkdir -pm 775 "${S2I_TARGET_DEPLOYMENTS_DIR}"
+        echo "created $S2I_TARGET_DEPLOYMENTS_DIR"
       fi
       local relative_source=$(realpath --relative-to "${S2I_SOURCE_DIR}" "${1}/${S2I_SOURCE_DEPLOYMENTS_DIR}")
       log_info "Copying deployments from $relative_source to ${S2I_TARGET_DEPLOYMENTS_DIR}..."
       for filter in ${S2I_SOURCE_DEPLOYMENTS_FILTER:-*}; do
         find "${S2I_SOURCE_DIR}/${relative_source}/" -maxdepth 1 -name "${filter}" | xargs -I '{}' -r cp -Lrpv '{}' "${S2I_TARGET_DEPLOYMENTS_DIR}"
+        echo "Copying $filter to $S2I_TARGET_DEPLOYMENTS_DIR"
       done
     fi
   fi 

modules/util/pathfinder/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/util/pathfinder/*
+
+pushd ${ARTIFACTS_DIR}
+cp -pr * /
+popd

modules/util/pathfinder/module.yaml

@@ -0,0 +1,34 @@
+schema_version: 1
+
+name: "jboss.container.util.pathfinder"
+version: "1.0"
+description: ^
+  "Provides support for determining Java application jar locations
+   as well as library directories"
+
+envs: 
+- name: JBOSS_CONTAINER_UTIL_PATHFINDER_MODULE
+  value: /opt/jboss/container/util/pathfinder
+
+- name: JAVA_APP_DIR
+  description: ^
+    The directory where the application resides. All paths in your application
+    are relative to this directory.
+  example: "myapplication/"
+
+- name: JAVA_MAIN_CLASS
+  description: ^
+    A main class to use as argument for `java`. When this environment variable
+    is given, all jar files in **JAVA_APP_DIR** are added to the classpath as
+    well as **JAVA_LIB_DIR**.
+  example: "com.example.MainClass"
+
+- name: JAVA_LIB_DIR
+  description: ^
+    Directory holding the Java jar files as well an optional `classpath` file
+    which holds the classpath. Either as a single line classpath (colon
+    separated) or with jar files listed line-by-line. If not set
+    **JAVA_LIB_DIR** is the same as **JAVA_APP_DIR**.
+
+execute:
+- script: configure.sh

tests/OPENJDK-1549/README.md

@@ -0,0 +1,18 @@
+# Test for OPENJDK-1549
+
+<https://issues.redhat.com/browse/OPENJDK-1549>
+
+This is a minimal Maven project for which the `validate` target will fail
+if the environment variable `MAVEN_ARGS` is defined.
+
+This is achieved using the Enforcer plugin. We could not use the
+`requireEnvironmentVariable` built-in rule as it can only fail if a variable
+is undefined, rather than if it is. Instead we use `evaluateBeanshell` and
+a very short Beanshell expression.
+
+Maven expands strings of the form `${env.foo}` within the POM only if the
+variable is defined. That is, when `MAVEN_ARGS` is not defined in the
+environment, the string `${env.MAVEN_ARGS}` is passed through unaltered.
+If the variable is defined (including defined but empty), Maven will expand
+it. Some string concatenation trickery is needed to match against the
+un-expanded form.