keycloak-aplcache

diff --git a/distribution/adapters/osgi/features/src/main/resources/features.xml b/distribution/adapters/osgi/features/src/main/resources/features.xml
index b61c752..e5efc8d 100755
--- a/distribution/adapters/osgi/features/src/main/resources/features.xml
+++ b/distribution/adapters/osgi/features/src/main/resources/features.xml
@@ -24,8 +24,10 @@
         <bundle dependency="true">mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle.crypto.version}</bundle>
         <bundle dependency="true">mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.crypto.version}</bundle>
         <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
+        <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
         <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
         <bundle dependency="true">mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson.version}</bundle>
+        <bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson.version}</bundle>
         <bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson.version}</bundle>
         <bundle dependency="true">mvn:org.jboss.logging/jboss-logging/${jboss.logging.version}</bundle>
         <bundle>mvn:org.keycloak/keycloak-common/${project.version}</bundle>

diff --git a/distribution/downloads/pom.xml b/distribution/downloads/pom.xml
index 9461075..aa7af2a 100755
--- a/distribution/downloads/pom.xml
+++ b/distribution/downloads/pom.xml
@@ -95,19 +95,6 @@
 
                                 <artifactItem>
                                     <groupId>org.keycloak</groupId>
-                                    <artifactId>keycloak-server-overlay-eap6</artifactId>
-                                    <type>zip</type>
-                                    <destFileName>keycloak-overlay-eap6-${project.version}.zip</destFileName>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.keycloak</groupId>
-                                    <artifactId>keycloak-server-overlay-eap6</artifactId>
-                                    <type>tar.gz</type>
-                                    <destFileName>keycloak-overlay-eap6-${project.version}.tar.gz</destFileName>
-                                </artifactItem>
-
-                                <artifactItem>
-                                    <groupId>org.keycloak</groupId>
                                     <artifactId>keycloak-proxy-dist</artifactId>
                                     <type>zip</type>
                                     <destFileName>keycloak-proxy-${project.version}.zip</destFileName>

diff --git a/examples/fuse/cxf-jaxrs/pom.xml b/examples/fuse/cxf-jaxrs/pom.xml
index 237cdae..a2de826 100755
--- a/examples/fuse/cxf-jaxrs/pom.xml
+++ b/examples/fuse/cxf-jaxrs/pom.xml
@@ -39,7 +39,7 @@
             META-INF.cxf.osgi;version="[2.7,3.2)";resolution:=optional,
             org.apache.cxf.transport.http;version="[2.7,3.2)",
             org.apache.cxf.*;version="[2.7,3.2)",
-            com.fasterxml.jackson.jaxrs;version="${jackson.version}",
+            com.fasterxml.jackson.jaxrs.json;version="${jackson.version}",
             org.keycloak.adapters.jetty;version="${project.version}",
             org.keycloak.adapters;version="${project.version}",
             *

diff --git a/examples/fuse/features/src/main/resources/features.xml b/examples/fuse/features/src/main/resources/features.xml
index ffe95de..c838b02 100644
--- a/examples/fuse/features/src/main/resources/features.xml
+++ b/examples/fuse/features/src/main/resources/features.xml
@@ -26,6 +26,7 @@
         <feature>cxf</feature>
         <feature>keycloak</feature>
         <bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson.version}</bundle>
+        <bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson.version}</bundle>
         <bundle>mvn:org.keycloak.example.demo/product-portal-fuse-example/${project.version}</bundle>
         <bundle>mvn:org.keycloak.example.demo/customer-portal-fuse-example/${project.version}/war</bundle>
         <bundle>mvn:org.keycloak.example.demo/camel-endpoint-example/${project.version}</bundle>

diff --git a/examples/providers/authenticator/README.md b/examples/providers/authenticator/README.md
index f9eafcc..833e5c9 100755
--- a/examples/providers/authenticator/README.md
+++ b/examples/providers/authenticator/README.md
@@ -4,7 +4,7 @@ Example User Federation Provider
 This is an example of defining a custom Authenticator and Required action.  This example is explained in the user documentation
 of Keycloak.   To deploy, build this directory then take the jar and copy it to standalone/configuration/providers. Alternatively you can deploy as a module by running:
 
-    KEYCLOAK_HOME/bin/jboss-cli.sh --command="module add --name=org.keycloak.examples.secret-question --resources=target/authenticator-required-action-example.jar --dependencies=org.keycloak.keycloak-core,org.keycloak.keycloak-model-api,org.keycloak.keycloak-login-api,org.keycloak.keycloak-services,org.jboss.resteasy.resteasy-jaxrs,javax.ws.rs.api"
+    KEYCLOAK_HOME/bin/jboss-cli.sh --command="module add --name=org.keycloak.examples.secret-question --resources=target/authenticator-required-action-example.jar --dependencies=org.keycloak.keycloak-core,org.keycloak.keycloak-server-spi,org.keycloak.keycloak-services,org.jboss.resteasy.resteasy-jaxrs,javax.ws.rs.api"
 
 Then registering the provider by editing keycloak-server.json and adding the module to the providers field:
 
@@ -21,7 +21,7 @@ the admin console to create a new flow with your new authenticator.
 
 If you go to the Authentication menu item and go to the Flow tab, you will be able to view the currently
 defined flows.  You cannot modify an built in flows, so, to add the Authenticator you
-have to copy an existing flow or create your own.  
+have to copy an existing flow or create your own.
 
 Next you have to register your required action.
 Click on the Required Actions tab.  Click on the Register button and choose your new Required Action.
@@ -29,4 +29,4 @@ Your new required action should now be displayed and enabled in the required act
 
 I'm hoping the UI is intuitive enough so that you
 can figure out for yourself how to create a flow and add the Authenticator and Required Action.  We're looking to add a screencast
-to show this in action.
+to show this in action.
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index 8159837..6dee32d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -285,7 +285,7 @@
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.module</groupId>
-                <artifactId>jaxb-annotations</artifactId>
+                <artifactId>jackson-module-jaxb-annotations</artifactId>
                 <version>${jackson.version}</version>
             </dependency>
             <dependency>