[OPENJDK-3666] merge jboss.container.java.s2i.{core,bash} modules

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

Author: jmtd

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

@@ -1,7 +1,7 @@
 
 # include dependencies
 source "${JBOSS_CONTAINER_UTIL_LOGGING_MODULE}/logging.sh"
-source "${JBOSS_CONTAINER_S2I_CORE_MODULE}/s2i-core"
+source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/s2i-core"
 
 # initialization of maven s2i module
 function maven_s2i_init() {

modules/maven/s2i/module.yaml

@@ -29,7 +29,6 @@ execute:
 modules:
   install:
   - name: jboss.container.user
-  - name: jboss.container.s2i.core
   - name: jboss.container.maven.default
   - name: jboss.container.util.logging
 

modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-overrides renamed to modules/s2i/artifacts/opt/jboss/container/java/s2i/maven-overrides

@@ -1,6 +1,6 @@
 
 source "${JBOSS_CONTAINER_UTIL_LOGGING_MODULE}/logging.sh"
-source "${JBOSS_CONTAINER_S2I_CORE_MODULE}/s2i-core"
+source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/s2i-core"
 
 # inject our overridden maven_*() functions
 function maven_s2i_source_maven_overrides() {

modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-s2i-overrides renamed to modules/s2i/artifacts/opt/jboss/container/java/s2i/maven-s2i-overrides

@@ -4,7 +4,7 @@
 args="$*"
 
 source "${JBOSS_CONTAINER_UTIL_LOGGING_MODULE}/logging.sh"
-source "${JBOSS_CONTAINER_S2I_CORE_MODULE}/s2i-core"
+source "$JBOSS_CONTAINER_JAVA_S2I_MODULE}/s2i-core"
 # include our s2i_core_*() overrides/extensions
 source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/s2i-core-hooks"