Rename and re-version jboss.container.maven.?? modules

Move to a scheme where we encode the RHEL major.minor version into the module version. So, jboss.container.maven.35.35scl provides Maven 3.5 via SCL for RHEL7.0+. The version is thus 7.0.3.5. Rename the four affected modules to a common module name "jboss.container.maven" and change their file paths down accordingly. Update jboss.container.maven.default.* which depend upon the above. Images using these modules will need to update. Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
jboss-openshift · Mar 31, 2020 · 2ed5833 · 2ed5833
1 parent 6af9186
commit 2ed5833
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 15 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/35/scl-enable-maven → ...jboss/container/maven/35/scl-enable-maven b/...jboss/container/maven/35/scl-enable-maven → ...jboss/container/maven/35/scl-enable-maven
diff --git a/jboss/container/maven/35/35scl/configure.sh → jboss/container/maven/7.0.3.5/configure.sh b/jboss/container/maven/35/35scl/configure.sh → jboss/container/maven/7.0.3.5/configure.sh
diff --git a/jboss/container/maven/35/35scl/module.yaml → jboss/container/maven/7.0.3.5/module.yaml b/jboss/container/maven/35/35scl/module.yaml → jboss/container/maven/7.0.3.5/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
-name: jboss.container.maven.35.bash
-version: '3.5scl'
+name: jboss.container.maven
+version: '7.0.3.5'
 description: Provides Maven v3.5 capabilities to an image via SCL
 
 labels:

diff --git a/...jboss/container/maven/36/scl-enable-maven → ...jboss/container/maven/36/scl-enable-maven b/...jboss/container/maven/36/scl-enable-maven → ...jboss/container/maven/36/scl-enable-maven
diff --git a/jboss/container/maven/36/36scl/configure.sh → jboss/container/maven/7.0.3.6/configure.sh b/jboss/container/maven/36/36scl/configure.sh → jboss/container/maven/7.0.3.6/configure.sh
diff --git a/jboss/container/maven/36/36scl/module.yaml → jboss/container/maven/7.0.3.6/module.yaml b/jboss/container/maven/36/36scl/module.yaml → jboss/container/maven/7.0.3.6/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
-name: jboss.container.maven.36.bash
-version: '3.6scl'
+name: jboss.container.maven
+version: '7.0.3.6'
 description: Provides Maven v3.6 capabilities to an image via SCL
 
 labels:

diff --git a/jboss/container/maven/35/default/module.yaml → jboss/container/maven/8.0.3.5/module.yaml b/jboss/container/maven/35/default/module.yaml → jboss/container/maven/8.0.3.5/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
-name: jboss.container.maven.35.bash
-version: '3.5'
+name: jboss.container.maven
+version: '8.0.3.5'
 description: Provides Maven v3.5 capabilities to an image.
 
 labels:

diff --git a/...s/container/maven/36/default/configure.sh → jboss/container/maven/8.2.3.6/configure.sh b/...s/container/maven/36/default/configure.sh → jboss/container/maven/8.2.3.6/configure.sh
diff --git a/jboss/container/maven/36/default/module.yaml → jboss/container/maven/8.2.3.6/module.yaml b/jboss/container/maven/36/default/module.yaml → jboss/container/maven/8.2.3.6/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
-name: jboss.container.maven.36.bash
-version: '3.6'
+name: jboss.container.maven
+version: '8.2.3.6'
 description: Provides Maven v3.6 capabilities to an image.
 
 labels:

diff --git a/jboss/container/maven/default/bash/36/module.yaml b/jboss/container/maven/default/bash/36/module.yaml
@@ -18,5 +18,6 @@ modules:
   install:
   - name: jboss.container.maven.api
   - name: jboss.container.java.jvm.bash
-  - name: jboss.container.maven.36.bash
+  - name: jboss.container.maven
+    version: 8.2.3.6
   - name: jboss.container.util.logging.bash
diff --git a/jboss/container/maven/default/bash/36/tests/bats/common.bash b/jboss/container/maven/default/bash/36/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/default/bash/default/module.yaml b/jboss/container/maven/default/bash/default/module.yaml
@@ -18,5 +18,6 @@ modules:
   install:
   - name: jboss.container.maven.api
   - name: jboss.container.java.jvm.bash
-  - name: jboss.container.maven.35.bash
+  - name: jboss.container.maven
+    version: 8.0.3.5
   - name: jboss.container.util.logging.bash
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