[CIAM-1756] Update values of WILDFLY_VERSION & GALLEON_WILDFLY_VERSION

env vars to match their respective versions used in 'EAP_742_CR1_2'
tag of JBEAP 7 image

Also update urls & MD5 sums of 'wildfly-galleon-maven-plugin' &
'wildfly-provisioning-parent' artifacts, since GALLEON_WILDFLY_VERSION
change

Signed-off-by: Jan Lieskovsky <[email protected]>

Author: Jan Lieskovsky

modules/eap/setup/eap/modules/configure.sh

@@ -952,14 +952,14 @@ fi
 rm -rf $JBOSS_HOME/*
 
 # CIAM-1436 correction
-# Ensure 'wildfly-galleon-maven-plugin-5.2.0.Alpha2.jar', 'wildfly-galleon-maven-plugin-5.2.0.Alpha2.pom', and
-# 'wildfly-provisioning-parent-5.2.0.Alpha2.pom' artifacts are installed to expected location prior launching
+# Ensure 'wildfly-galleon-maven-plugin-${GALLEON_WILDFLY_VERSION}.jar', 'wildfly-galleon-maven-plugin-${GALLEON_WILDFLY_VERSION}.pom', and
+# 'wildfly-provisioning-parent-${GALLEON_WILDFLY_VERSION}.pom' artifacts are installed to expected location prior launching
 # the build Galleon s2i feature-pack maven command below
 
 declare -ar EXPECTED_WILDFLY_ARTIFACTS=(
-  "wildfly-galleon-maven-plugin-5.2.0.Alpha2.jar"
-  "wildfly-galleon-maven-plugin-5.2.0.Alpha2.pom"
-  "wildfly-provisioning-parent-5.2.0.Alpha2.pom"
+  "wildfly-galleon-maven-plugin-${GALLEON_WILDFLY_VERSION}.jar"
+  "wildfly-galleon-maven-plugin-${GALLEON_WILDFLY_VERSION}.pom"
+  "wildfly-provisioning-parent-${GALLEON_WILDFLY_VERSION}.pom"
 )
 # Sanity check - confirm the required artifacts are present under "/tmp/artifacts" location
 for artifact in "${EXPECTED_WILDFLY_ARTIFACTS[@]}"
@@ -971,23 +971,23 @@ do
   fi
 done
 
-# Install JAR & POM files of 'wildfly-galleon-maven-plugin-5.2.0.Alpha2' dependency
-mvn install:install-file                                                          \
-  -Dfile="/tmp/artifacts/wildfly-galleon-maven-plugin-5.2.0.Alpha2.jar"           \
-  -Dmaven.repo.local="${TMP_GALLEON_LOCAL_MAVEN_REPO}"                            \
-  -DpomFile="/tmp/artifacts/wildfly-galleon-maven-plugin-5.2.0.Alpha2.pom"        \
+# Install JAR & POM files of 'wildfly-galleon-maven-plugin-${GALLEON_WILDFLY_VERSION}' dependency
+mvn install:install-file                                                                 \
+  -Dfile="/tmp/artifacts/wildfly-galleon-maven-plugin-${GALLEON_WILDFLY_VERSION}.jar"    \
+  -Dmaven.repo.local="${TMP_GALLEON_LOCAL_MAVEN_REPO}"                                   \
+  -DpomFile="/tmp/artifacts/wildfly-galleon-maven-plugin-${GALLEON_WILDFLY_VERSION}.pom" \
   --settings "${GALLEON_MAVEN_BUILD_IMG_SETTINGS_XML}"
 
-# Install POM file of 'wildfly-provisioning-parent-5.2.0.Alpha2.pom' dependency
+# Install POM file of 'wildfly-provisioning-parent-${GALLEON_WILDFLY_VERSION}.pom' dependency
 #
 # Note: The '-Dfile' argument in the following command is actually ignored, due
 #       to using the '-Dpackaging=pom' argument, so the corresponding JAR file
 #       of 'wildfly-provisioning-parent' isn't needed.
-mvn install:install-file                                                      \
-  -Dfile="/tmp/artifacts/wildfly-provisioning-parent-5.2.0.Alpha2.pom"        \
-  -Dmaven.repo.local="${TMP_GALLEON_LOCAL_MAVEN_REPO}"                        \
-  -Dpackaging=pom                                                             \
-  -DpomFile="/tmp/artifacts/wildfly-provisioning-parent-5.2.0.Alpha2.pom"     \
+mvn install:install-file                                                                 \
+  -Dfile="/tmp/artifacts/wildfly-provisioning-parent-${GALLEON_WILDFLY_VERSION}.pom"     \
+  -Dmaven.repo.local="${TMP_GALLEON_LOCAL_MAVEN_REPO}"                                   \
+  -Dpackaging=pom                                                                        \
+  -DpomFile="/tmp/artifacts/wildfly-provisioning-parent-${GALLEON_WILDFLY_VERSION}.pom"  \
   --settings "${GALLEON_MAVEN_BUILD_IMG_SETTINGS_XML}"
 
 # EOF CIAM-1436 correction

modules/eap/setup/eap/modules/module.yaml

@@ -56,25 +56,25 @@ artifacts:
 #       accordingly in the 'modules/eap/setup/eap/modules/configure.sh'
 #       script too !!!
 #
-- name: wildfly-galleon-maven-plugin-5.2.0.Alpha2.jar
-  target: wildfly-galleon-maven-plugin-5.2.0.Alpha2.jar
-  md5: 3c9a5e92268506c90bce4b37fef83dab
-  url: https://repo.maven.apache.org/maven2/org/wildfly/galleon-plugins/wildfly-galleon-maven-plugin/5.2.0.Alpha2/wildfly-galleon-maven-plugin-5.2.0.Alpha2.jar
-- name: wildfly-galleon-maven-plugin-5.2.0.Alpha2.pom
-  target: wildfly-galleon-maven-plugin-5.2.0.Alpha2.pom
-  md5: 5cb783c122d2478f0bc82505ad93a054
-  url: https://repo1.maven.org/maven2/org/wildfly/galleon-plugins/wildfly-galleon-maven-plugin/5.2.0.Alpha2/wildfly-galleon-maven-plugin-5.2.0.Alpha2.pom
-- name: wildfly-provisioning-parent-5.2.0.Alpha2.pom
-  target: wildfly-provisioning-parent-5.2.0.Alpha2.pom
-  md5: 03f4634dd62a4e62746a3837fbea608b
-  url: https://repo1.maven.org/maven2/org/wildfly/galleon-plugins/wildfly-provisioning-parent/5.2.0.Alpha2/wildfly-provisioning-parent-5.2.0.Alpha2.pom
+- name: wildfly-galleon-maven-plugin-5.1.2.Final.jar
+  target: wildfly-galleon-maven-plugin-5.1.2.Final.jar
+  md5: 0e12d3d2396de56c5f8c8e0851d7f3b8
+  url: https://repo.maven.apache.org/maven2/org/wildfly/galleon-plugins/wildfly-galleon-maven-plugin/5.1.2.Final/wildfly-galleon-maven-plugin-5.1.2.Final.jar
+- name: wildfly-galleon-maven-plugin-5.1.2.Final.pom
+  target: wildfly-galleon-maven-plugin-5.1.2.Final.pom
+  md5: 98d3d4c4b128a884fd76893a64599739
+  url: https://repo1.maven.org/maven2/org/wildfly/galleon-plugins/wildfly-galleon-maven-plugin/5.1.2.Final/wildfly-galleon-maven-plugin-5.1.2.Final.pom
+- name: wildfly-provisioning-parent-5.1.2.Final.pom
+  target: wildfly-provisioning-parent-5.1.2.Final.pom
+  md5: 7af23761dea205fd0fa622135fba8322
+  url: https://repo1.maven.org/maven2/org/wildfly/galleon-plugins/wildfly-provisioning-parent/5.1.2.Final/wildfly-provisioning-parent-5.1.2.Final.pom
 labels:
 - name: "org.jboss.product"
   value: "eap"
 - name: "org.jboss.product.version"
-  value: "7.4.0"
+  value: "7.4.2"
 - name: "org.jboss.product.eap.version"
-  value: "7.4.0"
+  value: "7.4.2"
 - name: "com.redhat.deployments-dir"
   value: "/opt/eap/standalone/deployments"
 - name: "com.redhat.dev-mode"
@@ -94,15 +94,15 @@ labels:
 envs:
 - name: "WILDFLY_VERSION"
   description: "Mandatory. WildFly server version."
-  value: "7.4.0.GA-redhat-00005"
+  value: "7.4.2.GA-redhat-00002"
 - name: "LAUNCH_JBOSS_IN_BACKGROUND"
   value: "true"
 - name: "JBOSS_PRODUCT"
   value: "eap"
 - name: "JBOSS_EAP_VERSION"
-  value: "7.4.0"
+  value: "7.4.2"
 - name: "PRODUCT_VERSION"
-  value: "7.4.0"
+  value: "7.4.2"
 - name: "EAP_FULL_GROUPID"
   value: "org.jboss.eap"
 - name: "JBOSS_HOME"
@@ -392,8 +392,14 @@ envs:
 - name: GALLEON_S2I_FP_ARTIFACT_ID
 - name: GALLEON_VERSION
   value: "4.2.8.Final"
+# Important:
+#
+#   If you are updating 'GALLEON_WILDFLY_VERSION' version below be sure simultaneously to update also
+#   the versions, urls & MD5 sums of the 'wildfly-galleon-maven-plugin' and 'wildfly-provisioning-parent'
+#   artifacts listed in the 'artifacts:' section above
+#
 - name: GALLEON_WILDFLY_VERSION
-  value: "5.2.0.Alpha2"
+  value: "5.1.2.Final"
 - name: GALLEON_S2I_PRODUCER_NAME
 - name: S2I_FP_VERSION
 - name: GALLEON_PROVISION_SERVER