From e90fe870c0f0885688fad274b5e6668f49d48acb Mon Sep 17 00:00:00 2001 From: Ken Wills Date: Wed, 14 Apr 2021 12:49:21 -0500 Subject: [PATCH] Merge pull request #228 from dbkreling/CLOUD-3951-bump-maven [CLOUD-3951] Bump maven module version to 3.6 --- .../wildfly/galleon/build-feature-pack/configure.sh | 5 +++++ .../container/wildfly/galleon/provision-server/configure.sh | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/jboss/container/wildfly/galleon/build-feature-pack/configure.sh b/jboss/container/wildfly/galleon/build-feature-pack/configure.sh index d8c9c40d..c9d9e48c 100644 --- 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 index f3f0f8dd..dc616825 100644 --- 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"