[OPENJDK-2968] simplify s2i/run's invocation of run-java.sh

Don't touch $JAVA_ARGS in s2i/run, leave that responsibility
to run-java.sh.

<https://issues.redhat.com/browse/OPENJDK-2968>

Signed-off-by: Jonathan Dowland <[email protected]>

Author: jmtd

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

@@ -247,4 +247,6 @@ startup() {
 
 # =============================================================================
 # Fire up
-startup $*
+
+echo "Starting the Java application using ${JBOSS_CONTAINER_JAVA_RUN_MODULE}/run-java.sh $* ${JAVA_ARGS}…"
+startup $* ${JAVA_ARGS}

modules/s2i/bash/artifacts/usr/local/s2i/run

@@ -11,7 +11,4 @@ source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/s2i-core-hooks"
 # Global S2I variable setup
 s2i_core_env_init
 
-export JAVA_OPTS
-
-echo "Starting the Java application using ${JBOSS_CONTAINER_JAVA_RUN_MODULE}/run-java.sh $args ${JAVA_ARGS}…"
-exec "${JBOSS_CONTAINER_JAVA_RUN_MODULE}/run-java.sh" $args ${JAVA_ARGS}
+exec "${JBOSS_CONTAINER_JAVA_RUN_MODULE}/run-java.sh" $args