Merge branch 'master' into JBEAP-20552

Author: luck3y

jboss/container/eap/galleon/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.jboss.eap.galleon.s2i</groupId>
     <artifactId>eap-s2i-galleon-pack</artifactId>
-    <version>20.0.0.Final</version>
+    <version>21.0.0.Final</version>
     <packaging>pom</packaging>
     <name>EAP Galleon feature-pack for OpenShift</name>
 

jboss/container/eap/galleon/config/ee/artifacts/opt/jboss/container/eap/galleon/definitions/fat-default-server/provisioning.xml

@@ -2,7 +2,7 @@
 
 <installation xmlns="urn:jboss:galleon:provisioning:3.0">
     <!-- Use the image version,  to avoid retrieving metadata.xml for un-released s2i FP-->
-    <feature-pack location="eap-s2i@maven(org.jboss.universe:s2i-universe)#20.0.0.Final">
+    <feature-pack location="eap-s2i@maven(org.jboss.universe:s2i-universe)#21.0.0.Final">
         <default-configs inherit="false">
             <include model="standalone" name="standalone.xml"/>
         </default-configs>

jboss/container/eap/galleon/config/ee/artifacts/opt/jboss/container/eap/galleon/definitions/slim-default-server/provisioning.xml

@@ -2,7 +2,7 @@
 
 <installation xmlns="urn:jboss:galleon:provisioning:3.0">
     <!-- Use the image version,  to avoid retrieving metadata.xml for un-released s2i FP-->
-    <feature-pack location="eap-s2i@maven(org.jboss.universe:s2i-universe)#20.0.0.Final">
+    <feature-pack location="eap-s2i@maven(org.jboss.universe:s2i-universe)#21.0.0.Final">
         <default-configs inherit="false">
             <include model="standalone" name="standalone.xml"/>
         </default-configs>

jboss/container/eap/galleon/module.yaml

@@ -5,7 +5,7 @@ description: Install Galleon descriptions and EAP s2i feature-pack. Configure ga
 
 envs:
 - name: S2I_FP_VERSION
-  value: "20.0.0.Final"
+  value: "21.0.0.Final"
 - name: GALLEON_DEFINITIONS
   value: /opt/jboss/container/eap/galleon/definitions
 - name: GALLEON_MAVEN_REPO_HOOK_SCRIPT