Merge jboss.container.s2i.core.{bash,api}

Simplify the module structure.

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

Author: jmtd

modules/maven/s2i/module.yaml

@@ -26,8 +26,7 @@ execute:
 
 modules:
   install:
-  - name: jboss.container.s2i.core.api
-  - name: jboss.container.s2i.core.bash
+  - name: jboss.container.s2i.core
   - name: jboss.container.maven.default
   - name: jboss.container.util.logging
 

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

@@ -1,9 +1,15 @@
 schema_version: 1
-name: jboss.container.s2i.core.api
-version: '1.0'
-description: ^
-  Defines environment variables and labels used by S2I.  Modules implementing
-  S2I capabilities should use these variables accordingly.
+name: jboss.container.s2i.core
+version: '9.0'
+description: "Provides support for core s2i capabilities."
+
+execute:
+- script: configure.sh
+
+packages:
+  install:
+  - findutils
+  - rsync
 
 labels:
 - name: "io.openshift.s2i.scripts-url"
@@ -14,6 +20,9 @@ labels:
   value: "/deployments"
 
 envs:
+- name: JBOSS_CONTAINER_S2I_CORE_MODULE
+  value: /opt/jboss/container/s2i/core/
+
 - name: S2I_DESTINATION_DIR
   description: ^
     Root directory for S2I mount, as specified by the