Merge pull request #235 from luck3y/CLOUD-3955

[CLOUD-3951] Bump maven module version to 3.6
wildfly · Apr 15, 2021 · f57ceee · f57ceee
2 parents d81d7c9 + e90fe87
commit f57ceee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/jboss/container/wildfly/galleon/build-feature-pack/configure.sh b/jboss/container/wildfly/galleon/build-feature-pack/configure.sh
@@ -70,11 +70,16 @@ else
   rm /tmp/offliner.jar && rm /tmp/offliner.txt
 fi
 
+# these are sourced so the most recent version is last an will apply if present
 if [ -f $JBOSS_CONTAINER_MAVEN_35_MODULE/scl-enable-maven ]; then
   # required to have maven enabled.
   source $JBOSS_CONTAINER_MAVEN_35_MODULE/scl-enable-maven
 fi
 
+if [ -f $JBOSS_CONTAINER_MAVEN_36_MODULE/scl-enable-maven ]; then
+  source $JBOSS_CONTAINER_MAVEN_36_MODULE/scl-enable-maven
+fi
+
 if [ -d "$JBOSS_HOME/modules" ]; then
   # Copy JBOSS_HOME/modules content (custom os modules) to modules.
   MODULES_DIR=$GALLEON_FP_PATH/src/main/resources/modules/

diff --git a/jboss/container/wildfly/galleon/provision-server/configure.sh b/jboss/container/wildfly/galleon/provision-server/configure.sh
@@ -7,11 +7,16 @@ if [ ! -d "$GALLEON_DEFAULT_SERVER" ]; then
   exit 1
 fi
 
+# these are sourced so the most recent version is last and will be applied
 if [ -f $JBOSS_CONTAINER_MAVEN_35_MODULE/scl-enable-maven ]; then
   # required to have maven enabled.
   source $JBOSS_CONTAINER_MAVEN_35_MODULE/scl-enable-maven
 fi
 
+if [ -f $JBOSS_CONTAINER_MAVEN_36_MODULE/scl-enable-maven ]; then
+  source $JBOSS_CONTAINER_MAVEN_36_MODULE/scl-enable-maven
+fi
+
 # Provision the default server
 # The active profiles are jboss-community-repository and securecentral
 cp "$GALLEON_DEFAULT_SERVER"/provisioning.xml "$JBOSS_CONTAINER_WILDFLY_S2I_GALLEON_PROVISION"