Merge pull request #178 from jfdenise/CD19-mp

CD 19

Author: jfdenise

jboss/container/config/cd/19.0/module.yaml

@@ -0,0 +1,4 @@
+schema_version: 1
+name: jboss.container.config.cd
+version: '19.0'
+description: Galleon generated default config for EAP CD19. For reference and bats tests.

jboss/container/config/cd/19.0/standalone-openshift.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)#18.0.0.Final">
+    <feature-pack location="eap-s2i@maven(org.jboss.universe:s2i-universe)#19.0.0.Final">
         <default-configs inherit="false">
             <include model="standalone" name="standalone.xml"/>
         </default-configs>

jboss/container/eap/galleon/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)#18.0.0.Final">
+    <feature-pack location="eap-s2i@maven(org.jboss.universe:s2i-universe)#19.0.0.Final">
         <default-configs inherit="false">
             <include model="standalone" name="standalone.xml"/>
         </default-configs>

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

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

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

@@ -3,15 +3,12 @@
 <config xmlns="urn:jboss:galleon:config:1.0" name="standalone.xml" model="standalone">
     <layers>
         <!-- we already have all required in default config -->
-        <exclude name="operator-required"/>
+        <!-- Although logically correct, galleon doesn't actually support excluding from model -->
+        <!-- This is harmeless, keeping the exclusion commented for reference until GAL-308 is fixed -->
+        <!--<exclude name="operator-required"/>-->
         <include name="amq6-rar"/>
     </layers>
 
-    <!-- ejb tx recovery package -->
-    <packages>
-        <package name="wildfly.s2i.ejb.tx.recovery"/>
-    </packages>
-
      <!-- sso packages -->
     <feature-group name="sso"/>
 
@@ -20,12 +17,6 @@
     <exclude feature-id="core-service.management.security-realm.server-identity.ssl:security-realm=ApplicationRealm"/>
     <feature-group name="os-management"/>
 
-    <!-- singleton -->
-    <feature-group name="singleton"/>
-
-    <!-- jgroups -->
-    <feature-group name="os-jgroups"/>
-
     <!-- mod-cluster -->
     <!-- required by modcluster -->
     <feature spec="subsystem.undertow">
@@ -74,34 +65,9 @@
     <!-- elytron -->
     <feature-group name="os-elytron"/>
 
-    <!-- infinispan -->
+    <!-- clustering -->
     <exclude spec="subsystem.infinispan"/>
-    <feature-group name="infinispan-dist-server"/>
-    <feature-group name="os-infinispan-dist-web"/>
-
-    <feature-group name="infinispan-dist-ejb">
-        <include feature-id="subsystem.infinispan.cache-container:cache-container=ejb">
-            <param name="default-cache" value="repl"/>
-            <feature spec="subsystem.infinispan.cache-container.replicated-cache">
-                <param name="replicated-cache" value="repl"/>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.memory.object">
-                    <param name="size" value="10000"/>
-                </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.locking">
-                    <param name="isolation" value="REPEATABLE_READ"/>
-                </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.transaction">
-                    <param name="mode" value="BATCH"/>
-                </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.store.file">
-                    <unset param="relative-to"/>
-                </feature>
-            </feature>
-        </include>
-    </feature-group>
-
-    <feature-group name="infinispan-dist-hibernate"/>
-    <feature-group name="os-infinispan-hibernate"/>
+    <feature-group name="os-clustering"/>
 
     <!-- micro-profile -->
     <feature-group name="os-observability"/>
@@ -124,14 +90,6 @@
 
     <feature-group name="os-socket"/>
 
-    <!-- sockets -->
-    <feature spec="socket-binding-group">
-        <param name="socket-binding-group" value="standard-sockets" />
-        <feature-group name="ha-sockets">
-            <exclude feature-id="socket-binding-group.socket-binding:name=standard-sockets,socket-binding=jgroups-udp-fd"/>
-            <exclude feature-id="socket-binding-group.socket-binding:name=standard-sockets,socket-binding=jgroups-tcp-fd"/>
-        </feature-group>
-    </feature>
     <feature-group name="os-undertow"/>
 
 </config>