Update paths for jboss.container.maven.default.bash rename

Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
jboss-openshift · Mar 30, 2020 · 708f0d5 · 708f0d5
1 parent 45d6b10
commit 708f0d5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/jboss-maven/module.yaml b/jboss-maven/module.yaml
@@ -5,5 +5,5 @@ description: Legacy Maven module
 
 modules:
   install:
-  - name: jboss.container.maven.default.bash
+  - name: jboss.container.maven.default
 
diff --git a/jboss/container/maven/default/tests/bats/common.bash b/jboss/container/maven/default/tests/bats/common.bash
@@ -13,10 +13,10 @@ export JBOSS_CONTAINER_UTIL_LOGGING_MODULE=$CCT_MODULE_DIR/jboss/container/util/
 
 mkdir -p $HOME/.m2
 
-source $CCT_MODULE_DIR/jboss/container/maven/default/bash/artifacts/opt/jboss/container/maven/default/maven.sh
+source $CCT_MODULE_DIR/jboss/container/maven/default/artifacts/opt/jboss/container/maven/default/maven.sh
 
 setup() {
-  cp $CCT_MODULE_DIR/jboss/container/maven/default/bash/artifacts/opt/jboss/container/maven/default/jboss-settings.xml $HOME/.m2/settings.xml
+  cp $CCT_MODULE_DIR/jboss/container/maven/default/artifacts/opt/jboss/container/maven/default/jboss-settings.xml $HOME/.m2/settings.xml
 }
 
 function assert_profile_xml() {

diff --git a/jboss/container/maven/s2i/module.yaml b/jboss/container/maven/s2i/module.yaml
@@ -32,5 +32,5 @@ modules:
   install:
   - name: jboss.container.s2i.core.api
   - name: jboss.container.s2i.core.bash
-  - name: jboss.container.maven.default.bash
+  - name: jboss.container.maven.default
   - name: jboss.container.util.logging.bash
diff --git a/s2i-common/module.yaml b/s2i-common/module.yaml
@@ -5,4 +5,4 @@ description: Legacy s2i-common script package.
 
 modules:
   install:
-  - name: jboss.container.maven.default.bash
+  - name: jboss.container.maven.default