Merge pull request #4464 from patriot1burke/master

KEYCLOAK-5439

distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/subsystems.xml

@@ -27,10 +27,8 @@
         <subsystem>keycloak-infinispan.xml</subsystem>
         <subsystem>jaxrs.xml</subsystem>
         <subsystem>jca.xml</subsystem>
-        <subsystem>jdr.xml</subsystem>
         <subsystem supplement="domain">jmx.xml</subsystem>
         <subsystem>jpa.xml</subsystem>
-        <subsystem>jsf.xml</subsystem>
         <subsystem>mail.xml</subsystem>
         <subsystem>naming.xml</subsystem>
         <subsystem>remoting.xml</subsystem>
@@ -54,11 +52,9 @@
         <subsystem supplement="ha">keycloak-infinispan.xml</subsystem>
         <subsystem>jaxrs.xml</subsystem>
         <subsystem>jca.xml</subsystem>
-        <subsystem>jdr.xml</subsystem>
         <subsystem>jgroups.xml</subsystem>
         <subsystem supplement="domain">jmx.xml</subsystem>
         <subsystem>jpa.xml</subsystem>
-        <subsystem>jsf.xml</subsystem>
         <subsystem>mail.xml</subsystem>
         <subsystem>mod_cluster.xml</subsystem>
         <subsystem>naming.xml</subsystem>

distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml

@@ -29,11 +29,9 @@
         <subsystem supplement="ha">keycloak-infinispan.xml</subsystem>
         <subsystem>jaxrs.xml</subsystem>
         <subsystem>jca.xml</subsystem>
-        <subsystem>jdr.xml</subsystem>
         <subsystem supplement="default">jgroups.xml</subsystem>
         <subsystem>jmx.xml</subsystem>
         <subsystem>jpa.xml</subsystem>
-        <subsystem>jsf.xml</subsystem>
         <subsystem>mail.xml</subsystem>
         <subsystem supplement="default">mod_cluster.xml</subsystem>
         <subsystem>naming.xml</subsystem>

distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems.xml

@@ -29,10 +29,8 @@
        <subsystem>keycloak-infinispan.xml</subsystem>
        <subsystem>jaxrs.xml</subsystem>
        <subsystem>jca.xml</subsystem>
-       <subsystem>jdr.xml</subsystem>
        <subsystem>jmx.xml</subsystem>
        <subsystem>jpa.xml</subsystem>
-       <subsystem>jsf.xml</subsystem>
        <subsystem>mail.xml</subsystem>
        <subsystem>naming.xml</subsystem>
        <subsystem>remoting.xml</subsystem>

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-services/main/module.xml

@@ -49,7 +49,6 @@
         <module name="javax.mail.api"/>
         <module name="javax.xml.soap.api"/>
         <module name="org.jboss.resteasy.resteasy-jaxrs"/>
-        <module name="org.jboss.resteasy.resteasy-crypto"/>
         <module name="org.jboss.resteasy.resteasy-multipart-provider"/>
         <module name="org.jboss.dmr"/>
         <module name="javax.servlet.api"/>

distribution/pom.xml

@@ -34,9 +34,9 @@
     <modules>
         <module>adapters</module>
         <module>saml-adapters</module>
+        <module>feature-packs</module>
         <module>server-dist</module>
         <module>server-overlay</module>
-        <module>feature-packs</module>
     </modules>
 
     <profiles>

distribution/server-dist/assembly.xml

@@ -33,6 +33,19 @@
             <includes>
                 <include>**/module.xml</include>
             </includes>
+            <!-- unused resteasy providers eat up memory, can't remove them as it my effect RH-SSO patching
+            <excludes>
+                <exclude>**/jose-jwt/**</exclude>
+                <exclude>**/resteasy-atom-provider/**</exclude>
+                <exclude>**/resteasy-crypto/**</exclude>
+                <exclude>**/resteasy-jettison-provider/**</exclude>
+                <exclude>**/resteasy-json-p-provider/**</exclude>
+                <exclude>**/resteasy-jsapi/**</exclude>
+                <exclude>**/resteasy-spring/**</exclude>
+                <exclude>**/resteasy-yaml-provider/**</exclude>
+                <exclude>**/jettison/**</exclude>
+            </excludes>
+            -->
         </fileSet>
         <fileSet>
             <directory>target/${project.build.finalName}</directory>
@@ -40,6 +53,10 @@
             <filtered>false</filtered>
             <excludes>
                 <exclude>bin/*.sh</exclude>
+                <!-- jboss-client.jar unused  Unfortunately, this may screw up our patch process so it can't be removed.
+                <exclude>bin/client/README-EJB-JMS.txt</exclude>
+                <exclude>bin/client/jboss-client.jar</exclude>
+                 -->
                 <exclude>module.xml</exclude>
                 <exclude>welcome-content/**</exclude>
                 <exclude>appclient/**</exclude>
@@ -49,8 +66,20 @@
                 <exclude>themes/**</exclude>
                 <exclude>version.txt</exclude>
                 <exclude>${profileExcludes}</exclude>
+                <!-- unused resteasy providers eat up memory can't remove them as it my effect RH-SSO patching
+                <exclude>**/jose-jwt/**</exclude>
+                <exclude>**/resteasy-atom-provider/**</exclude>
+                <exclude>**/resteasy-crypto/**</exclude>
+                <exclude>**/resteasy-jettison-provider/**</exclude>
+                <exclude>**/resteasy-json-p-provider/**</exclude>
+                <exclude>**/resteasy-jsapi/**</exclude>
+                <exclude>**/resteasy-spring/**</exclude>
+                <exclude>**/resteasy-yaml-provider/**</exclude>
+                <exclude>**/jettison/**</exclude>
+                 -->
             </excludes>
         </fileSet>
+
         <fileSet>
             <directory>target/${project.build.finalName}</directory>
             <outputDirectory/>