keycloak-uncached

diff --git a/distribution/adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml b/distribution/adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml
index 7419fa2..1525d77 100755
--- a/distribution/adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml
+++ b/distribution/adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml
@@ -27,26 +27,12 @@
 
     <fileSets>
         <fileSet>
-            <directory>${project.build.directory}/unpacked</directory>
+            <directory>${project.build.directory}/unpacked/modules</directory>
             <includes>
                 <include>com/fasterxml/jackson/**</include>
                 <include>org/bouncycastle/**</include>
-                <include>org/keycloak/keycloak-common/**</include>
-                <include>org/keycloak/keycloak-core/**</include>
-                <include>org/keycloak/keycloak-adapter-spi/**</include>
-                <include>org/keycloak/keycloak-adapter-core/**</include>
-                <include>org/keycloak/keycloak-jboss-adapter-core/**</include>
-                <include>org/keycloak/keycloak-as7-adapter/**</include>
-                <include>org/keycloak/keycloak-as7-subsystem/**</include>
-                <include>org/keycloak/keycloak-adapter-subsystem/**</include>
-                <include>org/keycloak/keycloak-servlet-oauth-client/**</include>
-
-                <!-- Authorization -->
-                <include>org/keycloak/keycloak-authz-client/**</include>
+                <include>org/keycloak/keycloak-*/**</include>
             </includes>
-            <excludes>
-                <exclude>**/*.war</exclude>
-            </excludes>
             <outputDirectory>modules</outputDirectory>
         </fileSet>
     </fileSets>

diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/assembly.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/assembly.xml
index 4acef09..e392cd2 100755
--- a/distribution/adapters/as7-eap6-adapter/as7-modules/assembly.xml
+++ b/distribution/adapters/as7-eap6-adapter/as7-modules/assembly.xml
@@ -25,15 +25,19 @@
 
     <fileSets>
         <fileSet>
-            <directory>../../</directory>
-            <includes>
-                <include>License.html</include>
-            </includes>
-            <outputDirectory></outputDirectory>
+            <directory>src/main/resources/licenses/${product.slot}</directory>
+            <outputDirectory>licenses</outputDirectory>
+            <excludes>
+                <exclude>licenses.xml</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/licenses</directory>
+            <outputDirectory>licenses</outputDirectory>
         </fileSet>
         <fileSet>
             <directory>${project.build.directory}/modules</directory>
-            <outputDirectory></outputDirectory>
+            <outputDirectory>modules</outputDirectory>
         </fileSet>
     </fileSets>
 </assembly>

diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml
index bd7680e..df9127a 100755
--- a/distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml
+++ b/distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml
@@ -37,75 +37,203 @@
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-common</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-adapter-spi</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-as7-adapter-spi</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-tomcat-adapter-spi</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-adapter-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-jboss-adapter-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-as7-adapter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-tomcat-core-adapter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-as7-subsystem</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-servlet-oauth-client</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-base</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jaxb-annotations</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- Authorization -->
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-authz-client</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
@@ -212,6 +340,10 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.keycloak</groupId>
+                <artifactId>keycloak-distribution-licenses-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>

diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9,Apache Software License 2.0.txt
new file mode 120000
index 0000000..26c4542
--- /dev/null
+++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9,Apache Software License 2.0.txt
@@ -0,0 +1 @@
+com.fasterxml.jackson.core,jackson-databind,2.8.9,Apache Software License 2.0.txt
\ No newline at end of file

diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9,Apache Software License 2.0.txt
new file mode 120000
index 0000000..26c4542
--- /dev/null
+++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9,Apache Software License 2.0.txt
@@ -0,0 +1 @@
+com.fasterxml.jackson.core,jackson-databind,2.8.9,Apache Software License 2.0.txt
\ No newline at end of file

diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9,Apache Software License 2.0.txt
new file mode 120000
index 0000000..26c4542
--- /dev/null
+++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9,Apache Software License 2.0.txt
@@ -0,0 +1 @@
+com.fasterxml.jackson.core,jackson-databind,2.8.9,Apache Software License 2.0.txt
\ No newline at end of file

diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.56,MIT License.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.56,MIT License.txt
new file mode 120000
index 0000000..0fe6a00
--- /dev/null
+++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.56,MIT License.txt
@@ -0,0 +1 @@
+org.bouncycastle,bcpkix-jdk15on,1.56,MIT License.txt
\ No newline at end of file

diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9.redhat-1,Apache Software License 2.0.txt
new file mode 120000
index 0000000..001ce00
--- /dev/null
+++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9.redhat-1,Apache Software License 2.0.txt
@@ -0,0 +1 @@
+com.fasterxml.jackson.core,jackson-databind,2.8.9.redhat-1,Apache Software License 2.0.txt
\ No newline at end of file

diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9.redhat-1,Apache Software License 2.0.txt
new file mode 120000
index 0000000..001ce00
--- /dev/null
+++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9.redhat-1,Apache Software License 2.0.txt
@@ -0,0 +1 @@
+com.fasterxml.jackson.core,jackson-databind,2.8.9.redhat-1,Apache Software License 2.0.txt
\ No newline at end of file

diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9,Apache Software License 2.0.txt
new file mode 120000
index 0000000..001ce00
--- /dev/null
+++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9,Apache Software License 2.0.txt
@@ -0,0 +1 @@
+com.fasterxml.jackson.core,jackson-databind,2.8.9.redhat-1,Apache Software License 2.0.txt
\ No newline at end of file

diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.56.0.redhat-2,MIT License.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.56.0.redhat-2,MIT License.txt
new file mode 120000
index 0000000..2484813
--- /dev/null
+++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.56.0.redhat-2,MIT License.txt
@@ -0,0 +1 @@
+org.bouncycastle,bcpkix-jdk15on,1.56.0.redhat-2,MIT License.txt
\ No newline at end of file

diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml b/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml
index dc6cfb3..228d498 100755
--- a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml
+++ b/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml
@@ -26,39 +26,17 @@
 
     <fileSets>
         <fileSet>
-            <directory>${project.build.directory}/unpacked</directory>
+            <directory>${project.build.directory}/unpacked/modules</directory>
             <includes>
                 <include>com/fasterxml/jackson/**</include>
                 <include>org/bouncycastle/**</include>
-                <include>org/keycloak/keycloak-common/**</include>
-                <include>org/keycloak/keycloak-core/**</include>
-                <include>org/keycloak/keycloak-adapter-spi/**</include>
-                <include>org/keycloak/keycloak-adapter-core/**</include>
-                <include>org/keycloak/keycloak-jboss-adapter-core/**</include>
-                <include>org/keycloak/keycloak-as7-adapter/**</include>
-                <include>org/keycloak/keycloak-as7-subsystem/**</include>
-                <include>org/keycloak/keycloak-adapter-subsystem/**</include>
-                <include>org/keycloak/keycloak-servlet-oauth-client/**</include>
-
-                <!-- Authorization -->
-                <include>org/keycloak/keycloak-authz-client/**</include>
+                <include>org/keycloak/keycloak-*/**</include>
             </includes>
-            <excludes>
-                <exclude>**/*.war</exclude>
-            </excludes>
             <outputDirectory>modules/system/add-ons/keycloak</outputDirectory>
         </fileSet>
-        <!-- License Data -->
-        <fileSet>
-            <directory>src/main/resources/licenses/${product.slot}</directory>
-            <outputDirectory>docs/licenses-${product.slot}-adapter</outputDirectory>
-            <excludes>
-                <exclude>licenses.xml</exclude>
-            </excludes>
-        </fileSet>
         <fileSet>
-            <directory>target/licenses</directory>
-            <outputDirectory>docs/licenses-${product.slot}-adapter</outputDirectory>
+            <directory>${project.build.directory}/unpacked/licenses</directory>
+            <outputDirectory>docs/licenses-${product.slot}</outputDirectory>
         </fileSet>
     </fileSets>
     <files>

diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml b/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml
index d303dad..1bf1737 100755
--- a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml
+++ b/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml
@@ -90,10 +90,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-distribution-licenses-maven-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 

diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9,Apache Software License 2.0.txt
new file mode 120000
index 0000000..26c4542
--- /dev/null
+++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9,Apache Software License 2.0.txt
@@ -0,0 +1 @@
+com.fasterxml.jackson.core,jackson-databind,2.8.9,Apache Software License 2.0.txt
\ No newline at end of file

diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9,Apache Software License 2.0.txt
new file mode 120000
index 0000000..26c4542
--- /dev/null
+++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9,Apache Software License 2.0.txt
@@ -0,0 +1 @@
+com.fasterxml.jackson.core,jackson-databind,2.8.9,Apache Software License 2.0.txt
\ No newline at end of file

diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9,Apache Software License 2.0.txt
new file mode 120000
index 0000000..26c4542
--- /dev/null
+++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9,Apache Software License 2.0.txt
@@ -0,0 +1 @@
+com.fasterxml.jackson.core,jackson-databind,2.8.9,Apache Software License 2.0.txt
\ No newline at end of file

diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml
index 121e73b..f643800 100644
--- a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml
+++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml
@@ -26,55 +26,66 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.5.4</version>
+      <version>2.8.9</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.5.4/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.8.9/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.5.4</version>
+      <version>2.8.9</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.5.4/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.8.9/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.5.4</version>
+      <version>2.8.9</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.5.4/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.8.9/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-base</artifactId>
-      <version>2.5.4</version>
+      <version>2.8.9</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.5.4/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.9/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-json-provider</artifactId>
-      <version>2.5.4</version>
+      <version>2.8.9</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.5.4/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.9/json/src/main/resources/META-INF/LICENSE</url>
+        </license>
+      </licenses>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.module</groupId>
+      <artifactId>jackson-module-jaxb-annotations</artifactId>
+      <version>2.8.9</version>
+      <licenses>
+        <license>
+          <name>Apache Software License 2.0</name>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.9/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
@@ -103,7 +114,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <version>4.5</version>
+      <version>4.5.2</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
@@ -114,7 +125,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore</artifactId>
-      <version>4.4.1</version>
+      <version>4.4.4</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
@@ -125,7 +136,7 @@
     <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging</artifactId>
-      <version>3.3.0.Final</version>
+      <version>3.3.1.Final</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>

diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.jboss.logging,jboss-logging,3.3.1.Final,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.jboss.logging,jboss-logging,3.3.1.Final,Apache Software License 2.0.txt
new file mode 120000
index 0000000..3ca8e90
--- /dev/null
+++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.jboss.logging,jboss-logging,3.3.1.Final,Apache Software License 2.0.txt
@@ -0,0 +1 @@
+commons-codec,commons-codec,1.9,Apache Software License 2.0.txt
\ No newline at end of file

diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9.redhat-1,Apache Software License 2.0.txt
new file mode 120000
index 0000000..001ce00
--- /dev/null
+++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9.redhat-1,Apache Software License 2.0.txt
@@ -0,0 +1 @@
+com.fasterxml.jackson.core,jackson-databind,2.8.9.redhat-1,Apache Software License 2.0.txt
\ No newline at end of file

diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9.redhat-1,Apache Software License 2.0.txt
new file mode 120000
index 0000000..001ce00
--- /dev/null
+++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9.redhat-1,Apache Software License 2.0.txt
@@ -0,0 +1 @@
+com.fasterxml.jackson.core,jackson-databind,2.8.9.redhat-1,Apache Software License 2.0.txt
\ No newline at end of file

diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9.redhat-1,Apache Software License 2.0.txt
new file mode 120000
index 0000000..001ce00
--- /dev/null
+++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9.redhat-1,Apache Software License 2.0.txt
@@ -0,0 +1 @@
+com.fasterxml.jackson.core,jackson-databind,2.8.9.redhat-1,Apache Software License 2.0.txt
\ No newline at end of file

diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml
index f86cf96..30dfc17 100644
--- a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml
+++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml
@@ -26,55 +26,66 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.5.4.redhat-1</version>
+      <version>2.8.9.redhat-1</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.5.4/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.8.9/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.5.4.redhat-1</version>
+      <version>2.8.9.redhat-1</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.5.4/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.8.9/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.5.4.redhat-1</version>
+      <version>2.8.9.redhat-1</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.5.4/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.8.9/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-base</artifactId>
-      <version>2.5.4.redhat-1</version>
+      <version>2.8.9.redhat-1</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.5.4/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.9/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-json-provider</artifactId>
-      <version>2.5.4.redhat-1</version>
+      <version>2.8.9.redhat-1</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.5.4/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.9/json/src/main/resources/META-INF/LICENSE</url>
+        </license>
+      </licenses>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.module</groupId>
+      <artifactId>jackson-module-jaxb-annotations</artifactId>
+      <version>2.8.9.redhat-1</version>
+      <licenses>
+        <license>
+          <name>Apache Software License 2.0</name>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.9/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
@@ -103,7 +114,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <version>4.5.0.redhat-1</version>
+      <version>4.5.2.redhat-1</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
@@ -114,7 +125,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore</artifactId>
-      <version>4.4.1.redhat-1</version>
+      <version>4.4.4.redhat-1</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
@@ -125,7 +136,7 @@
     <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging</artifactId>
-      <version>3.3.0.Final-redhat-1</version>
+      <version>3.3.1.Final-redhat-1</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>

diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.jboss.logging,jboss-logging,3.3.1.Final-redhat-1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.jboss.logging,jboss-logging,3.3.1.Final-redhat-1,Apache Software License 2.0.txt
new file mode 120000
index 0000000..3ca8e90
--- /dev/null
+++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.jboss.logging,jboss-logging,3.3.1.Final-redhat-1,Apache Software License 2.0.txt
@@ -0,0 +1 @@
+commons-codec,commons-codec,1.9,Apache Software License 2.0.txt
\ No newline at end of file

diff --git a/distribution/adapters/wildfly-adapter/assembly.xml b/distribution/adapters/wildfly-adapter/assembly.xml
index 69b8728..411e8cd 100755
--- a/distribution/adapters/wildfly-adapter/assembly.xml
+++ b/distribution/adapters/wildfly-adapter/assembly.xml
@@ -39,7 +39,7 @@
             <outputDirectory/>
             <filtered>false</filtered>
             <excludes>
-                <exclude>docs/**</exclude>
+                <exclude>docs/schema/**</exclude>
                 <exclude>README.md</exclude>
             </excludes>
         </fileSet>
@@ -66,18 +66,6 @@
                 <include>layers.conf</include>
             </includes>
         </fileSet>
-        <!-- License Data -->
-        <fileSet>
-            <directory>src/main/resources/licenses/${product.slot}</directory>
-            <outputDirectory>docs/licenses-${product.slot}-adapter</outputDirectory>
-            <excludes>
-                <exclude>licenses.xml</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>target/licenses</directory>
-            <outputDirectory>docs/licenses-${product.slot}-adapter</outputDirectory>
-        </fileSet>
     </fileSets>
     <files>
         <file>

diff --git a/distribution/adapters/wildfly-adapter/pom.xml b/distribution/adapters/wildfly-adapter/pom.xml
index 196c2ee..c352d74 100644
--- a/distribution/adapters/wildfly-adapter/pom.xml
+++ b/distribution/adapters/wildfly-adapter/pom.xml
@@ -80,10 +80,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-distribution-licenses-maven-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 

diff --git a/distribution/feature-packs/adapter-feature-pack/assembly.xml b/distribution/feature-packs/adapter-feature-pack/assembly.xml
index 9f9c962..e1e18e1 100644
--- a/distribution/feature-packs/adapter-feature-pack/assembly.xml
+++ b/distribution/feature-packs/adapter-feature-pack/assembly.xml
@@ -28,5 +28,18 @@
             <directory>target/${project.build.finalName}</directory>
             <outputDirectory/>            
         </fileSet>
+
+        <!-- License Data -->
+        <fileSet>
+            <directory>src/main/resources/licenses/${product.slot}</directory>
+            <outputDirectory>content/docs/licenses-${product.slot}</outputDirectory>
+            <excludes>
+                <exclude>licenses.xml</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>target/licenses</directory>
+            <outputDirectory>content/docs/licenses-${product.slot}</outputDirectory>
+        </fileSet>
     </fileSets>
 </assembly>

diff --git a/distribution/feature-packs/adapter-feature-pack/pom.xml b/distribution/feature-packs/adapter-feature-pack/pom.xml
index 89ca947..7b8b7db 100755
--- a/distribution/feature-packs/adapter-feature-pack/pom.xml
+++ b/distribution/feature-packs/adapter-feature-pack/pom.xml
@@ -33,37 +33,125 @@
     <dependencies>
         <dependency>
             <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-common</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-adapter-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-jboss-adapter-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
             <artifactId>keycloak-wildfly-subsystem</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-wildfly-adapter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-wildfly-elytron-oidc-adapter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-servlet-oauth-client</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-adapter-spi</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-undertow-adapter-spi</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-undertow-adapter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- Authorization -->
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-authz-client</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
@@ -114,6 +202,10 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.keycloak</groupId>
+                <artifactId>keycloak-distribution-licenses-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml
index 8921462..45d1e5c 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml
@@ -68,17 +68,6 @@
       </licenses>
     </dependency>
     <dependency>
-      <groupId>com.google.code.guice</groupId>
-      <artifactId>guice</artifactId>
-      <version>2.0</version>
-      <licenses>
-        <license>
-          <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/google/guice/2.0/COPYING</url>
-        </license>
-      </licenses>
-    </dependency>
-    <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-classworlds</artifactId>
       <version>2.5.2</version>
@@ -485,6 +474,61 @@
         </license>
       </licenses>
     </dependency>
+    <dependency>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-api</artifactId>
+      <version>6.5.0.Final</version>
+      <licenses>
+        <license>
+          <name>Apache Software License 2.0</name>
+          <url>https://raw.githubusercontent.com/kiegroup/drools/6.5.0.Final/LICENSE-ASL-2.0.txt</url>
+        </license>
+      </licenses>
+    </dependency>
+    <dependency>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-ci</artifactId>
+      <version>6.5.0.Final</version>
+      <licenses>
+        <license>
+          <name>Apache Software License 2.0</name>
+          <url>https://raw.githubusercontent.com/kiegroup/droolsjbpm-knowledge/6.5.0.Final/LICENSE-ASL-2.0.txt</url>
+        </license>
+      </licenses>
+    </dependency>
+    <dependency>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-internal</artifactId>
+      <version>6.5.0.Final</version>
+      <licenses>
+        <license>
+          <name>Apache Software License 2.0</name>
+          <url>https://raw.githubusercontent.com/kiegroup/droolsjbpm-knowledge/6.5.0.Final/LICENSE-ASL-2.0.txt</url>
+        </license>
+      </licenses>
+    </dependency>
+    <dependency>
+      <groupId>org.drools</groupId>
+      <artifactId>drools-compiler</artifactId>
+      <version>6.5.0.Final</version>
+      <licenses>
+        <license>
+          <name>Apache Software License 2.0</name>
+          <url>https://raw.githubusercontent.com/kiegroup/drools/6.5.0.Final/LICENSE-ASL-2.0.txt</url>
+        </license>
+      </licenses>
+    </dependency>
+    <dependency>
+      <groupId>org.drools</groupId>
+      <artifactId>drools-core</artifactId>
+      <version>6.5.0.Final</version>
+      <licenses>
+        <license>
+          <name>Apache Software License 2.0</name>
+          <url>https://raw.githubusercontent.com/kiegroup/drools/6.5.0.Final/LICENSE-ASL-2.0.txt</url>
+        </license>
+      </licenses>
+    </dependency>
   </dependencies>
   <others>
     <other>

diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.drools,drools-compiler,6.5.0.Final,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.drools,drools-compiler,6.5.0.Final,Apache Software License 2.0.txt
new file mode 120000
index 0000000..5034766
--- /dev/null
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.drools,drools-compiler,6.5.0.Final,Apache Software License 2.0.txt
@@ -0,0 +1 @@
+OpenSans,Apache Software License 2.0.txt
\ No newline at end of file

diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.drools,drools-core,6.5.0.Final,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.drools,drools-core,6.5.0.Final,Apache Software License 2.0.txt
new file mode 120000
index 0000000..5034766
--- /dev/null
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.drools,drools-core,6.5.0.Final,Apache Software License 2.0.txt
@@ -0,0 +1 @@
+OpenSans,Apache Software License 2.0.txt
\ No newline at end of file

diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.kie,kie-api,6.5.0.Final,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.kie,kie-api,6.5.0.Final,Apache Software License 2.0.txt
new file mode 120000
index 0000000..5034766
--- /dev/null
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.kie,kie-api,6.5.0.Final,Apache Software License 2.0.txt
@@ -0,0 +1 @@
+OpenSans,Apache Software License 2.0.txt
\ No newline at end of file

diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.kie,kie-ci,6.5.0.Final,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.kie,kie-ci,6.5.0.Final,Apache Software License 2.0.txt
new file mode 120000
index 0000000..5034766
--- /dev/null
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.kie,kie-ci,6.5.0.Final,Apache Software License 2.0.txt
@@ -0,0 +1 @@
+OpenSans,Apache Software License 2.0.txt
\ No newline at end of file

diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.kie,kie-internal,6.5.0.Final,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.kie,kie-internal,6.5.0.Final,Apache Software License 2.0.txt
new file mode 120000
index 0000000..5034766
--- /dev/null
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.kie,kie-internal,6.5.0.Final,Apache Software License 2.0.txt
@@ -0,0 +1 @@
+OpenSans,Apache Software License 2.0.txt
\ No newline at end of file

diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml
index f73e4eb..1464cad 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>org.freemarker</groupId>
       <artifactId>freemarker</artifactId>
-      <version>2.3.26.incubating-redhat-1</version>
+      <version>2.3.26.incubating-redhat-3</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
@@ -68,17 +68,6 @@
       </licenses>
     </dependency>
     <dependency>
-      <groupId>com.google.code.guice</groupId>
-      <artifactId>guice</artifactId>
-      <version>2.0</version>
-      <licenses>
-        <license>
-          <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/google/guice/2.0/COPYING</url>
-        </license>
-      </licenses>
-    </dependency>
-    <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-classworlds</artifactId>
       <version>2.5.2</version>
@@ -485,6 +474,61 @@
         </license>
       </licenses>
     </dependency>
+    <dependency>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-api</artifactId>
+      <version>6.5.0.Final-redhat-17</version>
+      <licenses>
+        <license>
+          <name>Apache Software License 2.0</name>
+          <url>https://raw.githubusercontent.com/kiegroup/drools/6.5.0.Final/LICENSE-ASL-2.0.txt</url>
+        </license>
+      </licenses>
+    </dependency>
+    <dependency>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-ci</artifactId>
+      <version>6.5.0.Final-redhat-17</version>
+      <licenses>
+        <license>
+          <name>Apache Software License 2.0</name>
+          <url>https://raw.githubusercontent.com/kiegroup/droolsjbpm-knowledge/6.5.0.Final/LICENSE-ASL-2.0.txt</url>
+        </license>
+      </licenses>
+    </dependency>
+    <dependency>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-internal</artifactId>
+      <version>6.5.0.Final-redhat-17</version>
+      <licenses>
+        <license>
+          <name>Apache Software License 2.0</name>
+          <url>https://raw.githubusercontent.com/kiegroup/droolsjbpm-knowledge/6.5.0.Final/LICENSE-ASL-2.0.txt</url>
+        </license>
+      </licenses>
+    </dependency>
+    <dependency>
+      <groupId>org.drools</groupId>
+      <artifactId>drools-compiler</artifactId>
+      <version>6.5.0.Final-redhat-17</version>
+      <licenses>
+        <license>
+          <name>Apache Software License 2.0</name>
+          <url>https://raw.githubusercontent.com/kiegroup/drools/6.5.0.Final/LICENSE-ASL-2.0.txt</url>
+        </license>
+      </licenses>
+    </dependency>
+    <dependency>
+      <groupId>org.drools</groupId>
+      <artifactId>drools-core</artifactId>
+      <version>6.5.0.Final-redhat-17</version>
+      <licenses>
+        <license>
+          <name>Apache Software License 2.0</name>
+          <url>https://raw.githubusercontent.com/kiegroup/drools/6.5.0.Final/LICENSE-ASL-2.0.txt</url>
+        </license>
+      </licenses>
+    </dependency>
   </dependencies>
   <others>
     <other>

diff --git a/distribution/licenses-common/check-licenses.sh b/distribution/licenses-common/check-licenses.sh
new file mode 100755
index 0000000..beba47e
--- /dev/null
+++ b/distribution/licenses-common/check-licenses.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+MODULES=`readlink -f $1`
+LICENSES=`readlink -f $2`
+
+for i in `find $MODULES -name '*.jar'`; do
+	if ( unzip -l $i | grep pom.properties &>/dev/null ); then
+		unzip -p $i '*/pom.properties' > /tmp/pom.properties
+		source /tmp/pom.properties &>/dev/null
+
+		if [ ! -f $LICENSES/$groupId\,$artifactId\,$version,* ]; then	
+			echo "Missing: "
+			echo "group: $groupId"
+			echo "artifcat: $artifactId"
+			echo "version: $version"
+			echo "---------------------"
+		fi
+	else
+		echo "Not Maven: $i"
+		echo "---------------------"
+	fi
+
+
+done

diff --git a/distribution/saml-adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml b/distribution/saml-adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml
index bae0714..4756c8f 100755
--- a/distribution/saml-adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml
+++ b/distribution/saml-adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml
@@ -26,23 +26,11 @@
 
     <fileSets>
         <fileSet>
-            <directory>${project.build.directory}/unpacked</directory>
+            <directory>${project.build.directory}/unpacked/modules</directory>
             <includes>
-                <include>org/keycloak/keycloak-common/**</include>
-                <include>org/keycloak/keycloak-saml-core/**</include>
-                <include>org/keycloak/keycloak-saml-adapter-core/**</include>
-                <include>org/keycloak/keycloak-saml-core-public/**</include>
-                <include>org/keycloak/keycloak-saml-adapter-api-public/**</include>
-                <include>org/keycloak/keycloak-adapter-spi/**</include>
-                <include>org/keycloak/keycloak-jboss-adapter-core/**</include>
                 <include>org/bouncycastle/**</include>
-                <include>org/keycloak/keycloak-saml-as7-adapter/**</include>
-                <include>org/keycloak/keycloak-saml-as7-subsystem/**</include>
-                <include>org/keycloak/keycloak-saml-adapter-subsystem/**</include>
+                <include>org/keycloak/keycloak-*/**</include>
             </includes>
-            <excludes>
-                <exclude>**/*.war</exclude>
-            </excludes>
             <outputDirectory>modules</outputDirectory>
         </fileSet>
     </fileSets>

diff --git a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/assembly.xml b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/assembly.xml
index 4acef09..e392cd2 100755
--- a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/assembly.xml
+++ b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/assembly.xml
@@ -25,15 +25,19 @@
 
     <fileSets>
         <fileSet>
-            <directory>../../</directory>
-            <includes>
-                <include>License.html</include>
-            </includes>
-            <outputDirectory></outputDirectory>
+            <directory>src/main/resources/licenses/${product.slot}</directory>
+            <outputDirectory>licenses</outputDirectory>
+            <excludes>
+                <exclude>licenses.xml</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/licenses</directory>
+            <outputDirectory>licenses</outputDirectory>
         </fileSet>
         <fileSet>
             <directory>${project.build.directory}/modules</directory>
-            <outputDirectory></outputDirectory>
+            <outputDirectory>modules</outputDirectory>
         </fileSet>
     </fileSets>
 </assembly>

diff --git a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/pom.xml b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/pom.xml
index a3005fb..a06eb9b 100755
--- a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/pom.xml
+++ b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/pom.xml
@@ -37,55 +37,142 @@
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-common</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-saml-core-public</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-adapter-spi</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-as7-adapter-spi</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-saml-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-saml-adapter-api-public</artifactId>
-            <scope>provided</scope>
+            <artifactId>keycloak-saml-adapter-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-saml-adapter-core</artifactId>
+            <artifactId>keycloak-saml-tomcat-adapter-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-saml-tomcat-adapter-core</artifactId>
+            <artifactId>keycloak-saml-adapter-api-public</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-jboss-adapter-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
          <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-saml-as7-adapter</artifactId>
+             <exclusions>
+                 <exclusion>
+                     <groupId>*</groupId>
+                     <artifactId>*</artifactId>
+                 </exclusion>
+             </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-saml-as7-subsystem</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-tomcat-adapter-spi</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
@@ -192,6 +279,10 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.keycloak</groupId>
+                <artifactId>keycloak-distribution-licenses-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>

diff --git a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.56,MIT License.txt b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.56,MIT License.txt
new file mode 120000
index 0000000..0fe6a00
--- /dev/null
+++ b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.56,MIT License.txt
@@ -0,0 +1 @@
+org.bouncycastle,bcpkix-jdk15on,1.56,MIT License.txt
\ No newline at end of file

diff --git a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.52.0.redhat-3,MIT License.txt b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.52.0.redhat-3,MIT License.txt
new file mode 120000
index 0000000..4cd18fa
--- /dev/null
+++ b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.52.0.redhat-3,MIT License.txt
@@ -0,0 +1 @@
+org.bouncycastle,bcpkix-jdk15on,1.52.0.redhat-3,MIT License.txt
\ No newline at end of file

diff --git a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml b/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml
index ed16317..b3d4861 100755
--- a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml
+++ b/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml
@@ -26,36 +26,16 @@
 
     <fileSets>
         <fileSet>
-            <directory>${project.build.directory}/unpacked</directory>
+            <directory>${project.build.directory}/unpacked/modules</directory>
             <includes>
-                <include>org/keycloak/keycloak-common/**</include>
-                <include>org/keycloak/keycloak-saml-core/**</include>
-                <include>org/keycloak/keycloak-saml-adapter-core/**</include>
-                <include>org/keycloak/keycloak-saml-core-public/**</include>
-                <include>org/keycloak/keycloak-adapter-spi/**</include>
-                <include>org/keycloak/keycloak-saml-adapter-api-public/**</include>
-                <include>org/keycloak/keycloak-jboss-adapter-core/**</include>
                 <include>org/bouncycastle/**</include>
-                <include>org/keycloak/keycloak-saml-as7-adapter/**</include>
-                <include>org/keycloak/keycloak-saml-as7-subsystem/**</include>
-                <include>org/keycloak/keycloak-saml-adapter-subsystem/**</include>
+                <include>org/keycloak/keycloak-*/**</include>
             </includes>
-            <excludes>
-                <exclude>**/*.war</exclude>
-            </excludes>
             <outputDirectory>modules/system/add-ons/keycloak</outputDirectory>
         </fileSet>
-        <!-- License Data -->
         <fileSet>
-            <directory>src/main/resources/licenses/${product.slot}</directory>
-            <outputDirectory>docs/licenses-${product.slot}-adapter</outputDirectory>
-            <excludes>
-                <exclude>licenses.xml</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>target/licenses</directory>
-            <outputDirectory>docs/licenses-${product.slot}-adapter</outputDirectory>
+            <directory>${project.build.directory}/unpacked/licenses</directory>
+            <outputDirectory>docs/licenses-${product.slot}</outputDirectory>
         </fileSet>
     </fileSets>
     <files>

diff --git a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml b/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml
index 7c88834..5dc893f 100755
--- a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml
+++ b/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml
@@ -90,10 +90,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-distribution-licenses-maven-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 

diff --git a/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml b/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml
index 41ffac3..9cb207e 100755
--- a/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml
+++ b/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml
@@ -26,37 +26,15 @@
 
     <fileSets>
         <fileSet>
-            <directory>${project.build.directory}/unpacked</directory>
+            <directory>${project.build.directory}/unpacked/modules</directory>
             <includes>
-                <include>org/keycloak/keycloak-common/**</include>
-                <include>org/keycloak/keycloak-saml-core/**</include>
-                <include>org/keycloak/keycloak-saml-core-public/**</include>
-                <include>org/keycloak/keycloak-saml-adapter-core/**</include>
-                <include>org/keycloak/keycloak-saml-adapter-api-public/**</include>
-                <include>org/keycloak/keycloak-adapter-spi/**</include>
-                <include>org/keycloak/keycloak-jboss-adapter-core/**</include>
-                <include>org/keycloak/keycloak-saml-undertow-adapter/**</include>
-                <include>org/keycloak/keycloak-saml-wildfly-adapter/**</include>
-                <include>org/keycloak/keycloak-saml-wildfly-elytron-adapter/**</include>
-                <include>org/keycloak/keycloak-saml-wildfly-subsystem/**</include>
-                <include>org/keycloak/keycloak-saml-adapter-subsystem/**</include>
+                <include>**/**</include>
             </includes>
-            <excludes>
-                <exclude>**/*.war</exclude>
-            </excludes>
             <outputDirectory>modules/system/add-ons/keycloak</outputDirectory>
         </fileSet>
-        <!-- License Data -->
         <fileSet>
-            <directory>src/main/resources/licenses/${product.slot}</directory>
-            <outputDirectory>docs/licenses-${product.slot}-adapter</outputDirectory>
-            <excludes>
-                <exclude>licenses.xml</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>target/licenses</directory>
-            <outputDirectory>docs/licenses-${product.slot}-adapter</outputDirectory>
+            <directory>${project.build.directory}/unpacked/licenses</directory>
+            <outputDirectory>docs/licenses-${product.slot}</outputDirectory>
         </fileSet>
     </fileSets>
     <files>

diff --git a/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml b/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml
index 444665b..3fa2c87 100755
--- a/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml
+++ b/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml
@@ -87,10 +87,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-distribution-licenses-maven-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 

diff --git a/distribution/saml-adapters/wildfly-adapter/wildfly-modules/assembly.xml b/distribution/saml-adapters/wildfly-adapter/wildfly-modules/assembly.xml
index 4acef09..e392cd2 100755
--- a/distribution/saml-adapters/wildfly-adapter/wildfly-modules/assembly.xml
+++ b/distribution/saml-adapters/wildfly-adapter/wildfly-modules/assembly.xml
@@ -25,15 +25,19 @@
 
     <fileSets>
         <fileSet>
-            <directory>../../</directory>
-            <includes>
-                <include>License.html</include>
-            </includes>
-            <outputDirectory></outputDirectory>
+            <directory>src/main/resources/licenses/${product.slot}</directory>
+            <outputDirectory>licenses</outputDirectory>
+            <excludes>
+                <exclude>licenses.xml</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/licenses</directory>
+            <outputDirectory>licenses</outputDirectory>
         </fileSet>
         <fileSet>
             <directory>${project.build.directory}/modules</directory>
-            <outputDirectory></outputDirectory>
+            <outputDirectory>modules</outputDirectory>
         </fileSet>
     </fileSets>
 </assembly>

diff --git a/distribution/saml-adapters/wildfly-adapter/wildfly-modules/pom.xml b/distribution/saml-adapters/wildfly-adapter/wildfly-modules/pom.xml
index 2641f9c..a0b59bc 100755
--- a/distribution/saml-adapters/wildfly-adapter/wildfly-modules/pom.xml
+++ b/distribution/saml-adapters/wildfly-adapter/wildfly-modules/pom.xml
@@ -37,46 +37,122 @@
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-common</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-adapter-spi</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-undertow-adapter-spi</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-saml-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-saml-adapter-api-public</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-saml-adapter-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-jboss-adapter-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-saml-undertow-adapter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-saml-core-public</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-saml-wildfly-adapter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-saml-wildfly-elytron-adapter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-saml-wildfly-subsystem</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
@@ -183,7 +259,10 @@
                     </execution>
                 </executions>
             </plugin>
-
+            <plugin>
+                <groupId>org.keycloak</groupId>
+                <artifactId>keycloak-distribution-licenses-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>