KEYCLOAK-1809

Upgrade jackson to version 2.x

broker/oidc/pom.xml

@@ -24,13 +24,13 @@
             <artifactId>keycloak-broker-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core-asl</artifactId>
+            <artifactId>jackson-core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
+            <artifactId>jackson-databind</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

broker/oidc/src/main/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProvider.java

@@ -17,8 +17,8 @@
  */
 package org.keycloak.broker.oidc;
 
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.databind.JsonNode;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.jboss.logging.Logger;
 import org.keycloak.common.ClientConnection;
 import org.keycloak.OAuth2Constants;
@@ -115,7 +115,7 @@ public abstract class AbstractOAuth2IdentityProvider<C extends OAuth2IdentityPro
             try {
             		JsonNode node = mapper.readTree(response);
             		if(node.has(tokenName)){
-            			String s = node.get(tokenName).getTextValue();
+            			String s = node.get(tokenName).textValue();
             			if(s == null || s.trim().isEmpty())
             				return null;
                   return s;

broker/oidc/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProvider.java

@@ -17,7 +17,7 @@
  */
 package org.keycloak.broker.oidc;
 
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.databind.JsonNode;
 import org.jboss.logging.Logger;
 import org.keycloak.broker.oidc.mappers.AbstractJsonUserAttributeMapper;
 import org.keycloak.broker.oidc.util.JsonSimpleHttp;

broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/AbstractJsonUserAttributeMapper.java

@@ -3,7 +3,7 @@ package org.keycloak.broker.oidc.mappers;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.databind.JsonNode;
 import org.jboss.logging.Logger;
 import org.keycloak.broker.oidc.OIDCIdentityProvider;
 import org.keycloak.broker.provider.AbstractIdentityProviderMapper;

broker/oidc/src/main/java/org/keycloak/broker/oidc/util/JsonSimpleHttp.java

@@ -1,7 +1,7 @@
 package org.keycloak.broker.oidc.util;
 
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.databind.JsonNode;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.keycloak.broker.provider.util.SimpleHttp;
 
 import java.io.IOException;

broker/oidc/src/test/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProviderTest.java

@@ -5,7 +5,7 @@
  */
 package org.keycloak.broker.oidc;
 
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.databind.JsonNode;
 import org.junit.Assert;
 import org.junit.Test;
 import org.keycloak.broker.provider.BrokeredIdentityContext;

broker/oidc/src/test/java/org/keycloak/broker/oidc/mappers/AbstractJsonUserAttributeMapperTest.java

@@ -7,9 +7,9 @@ package org.keycloak.broker.oidc.mappers;
 
 import java.io.IOException;
 
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.core.JsonProcessingException;
-import org.codehaus.jackson.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -24,15 +24,14 @@ public class AbstractJsonUserAttributeMapperTest {
 
 	private static JsonNode baseNode;
 
-	private JsonNode getJsonNode() throws JsonProcessingException, IOException {
+	private JsonNode getJsonNode() throws IOException {
 		if (baseNode == null)
 			baseNode = mapper.readTree("{ \"value1\" : \"v1 \",\"value_empty\" : \"\", \"value_b\" : true, \"value_i\" : 454, " + " \"value_array\":[\"a1\",\"a2\"], " +" \"nest1\": {\"value1\": \" fgh \",\"value_empty\" : \"\", \"nest2\":{\"value_b\" : false, \"value_i\" : 43}}, "+ " \"nesta\": { \"a\":[{\"av1\": \"vala1\"},{\"av1\": \"vala2\"}]}"+" }");
 		return baseNode;
 	}
 
 	@Test
-	public void getJsonValue_invalidPath() throws JsonProcessingException, IOException {
+	public void getJsonValue_invalidPath() throws IOException {
-
 		Assert.assertNull(AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "."));
 		Assert.assertNull(AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), ".."));
 		Assert.assertNull(AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "...value1"));

client-registration/api/src/main/java/org/keycloak/client/registration/ClientRegistration.java

@@ -1,9 +1,9 @@
 package org.keycloak.client.registration;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import org.apache.http.client.HttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
 import org.keycloak.representations.adapters.config.AdapterConfig;
 import org.keycloak.representations.idm.ClientRepresentation;
 import org.keycloak.representations.oidc.OIDCClientRepresentation;
@@ -19,9 +19,9 @@ public class ClientRegistration {
 
     public static final ObjectMapper outputMapper = new ObjectMapper();
     static {
-        outputMapper.getSerializationConfig().addMixInAnnotations(ClientRepresentation.class, ClientRepresentationMixIn.class);
+        outputMapper.addMixIn(ClientRepresentation.class, ClientRepresentationMixIn.class);
-        outputMapper.getSerializationConfig().addMixInAnnotations(OIDCClientRepresentation.class, OIDCClientRepresentationMixIn.class);
+        outputMapper.addMixIn(OIDCClientRepresentation.class, OIDCClientRepresentationMixIn.class);
-        outputMapper.setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL);
+        outputMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
     }
 
     private final String JSON = "application/json";

client-registration/api/src/main/java/org/keycloak/client/registration/ClientRepresentationMixIn.java

@@ -1,6 +1,6 @@
 package org.keycloak.client.registration;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 /**
  * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>

client-registration/api/src/main/java/org/keycloak/client/registration/OIDCClientRepresentationMixIn.java

@@ -1,6 +1,6 @@
 package org.keycloak.client.registration;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 /**
  * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>

client-registration/cli/src/main/java/org/keycloak/client/registration/cli/Context.java

@@ -1,6 +1,6 @@
 package org.keycloak.client.registration.cli;
 
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.codehaus.jackson.map.SerializationConfig;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 import org.keycloak.client.registration.ClientRegistration;

core/pom.xml

@@ -38,12 +38,12 @@
             <artifactId>bcpkix-jdk15on</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core-asl</artifactId>
+            <artifactId>jackson-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

core/src/main/java/org/keycloak/jose/jwk/JWK.java

@@ -1,8 +1,8 @@
 package org.keycloak.jose.jwk;
 
-import org.codehaus.jackson.annotate.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import org.codehaus.jackson.annotate.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.HashMap;
 import java.util.Map;

core/src/main/java/org/keycloak/jose/jwk/JWKParser.java

@@ -1,6 +1,6 @@
 package org.keycloak.jose.jwk;
 
-import org.codehaus.jackson.type.TypeReference;
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.keycloak.common.util.Base64Url;
 import org.keycloak.util.JsonSerialization;
 

core/src/main/java/org/keycloak/jose/jwk/RSAPublicJWK.java

@@ -1,6 +1,6 @@
 package org.keycloak.jose.jwk;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>

core/src/main/java/org/keycloak/jose/jws/JWSHeader.java

@@ -1,9 +1,9 @@
 package org.keycloak.jose.jws;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonInclude;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.annotation.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -54,7 +54,7 @@ public class JWSHeader implements Serializable {
     private static final ObjectMapper mapper = new ObjectMapper();
 
     static {
-        mapper.setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL);
+        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
 
     }
 

core/src/main/java/org/keycloak/json/StringOrArrayDeserializer.java

@@ -1,10 +1,9 @@
 package org.keycloak.json;
 
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.core.JsonParser;
-import org.codehaus.jackson.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
-import org.codehaus.jackson.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonDeserializer;
-import org.codehaus.jackson.map.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonNode;
-import org.codehaus.jackson.map.JsonDeserializer;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -19,11 +18,11 @@ public class StringOrArrayDeserializer extends JsonDeserializer<Object> {
             ArrayList<String> a = new ArrayList<>(1);
             Iterator<JsonNode> itr = jsonNode.iterator();
             while (itr.hasNext()) {
-                a.add(itr.next().getTextValue());
+                a.add(itr.next().textValue());
             }
             return a.toArray(new String[a.size()]);
         } else {
-            return new String[] { jsonNode.getTextValue() };
+            return new String[] { jsonNode.textValue() };
         }
     }
 

core/src/main/java/org/keycloak/json/StringOrArraySerializer.java

@@ -1,8 +1,8 @@
 package org.keycloak.json;
 
-import org.codehaus.jackson.JsonGenerator;
+import com.fasterxml.jackson.core.JsonGenerator;
-import org.codehaus.jackson.map.JsonSerializer;
+import com.fasterxml.jackson.databind.JsonSerializer;
-import org.codehaus.jackson.map.SerializerProvider;
+import com.fasterxml.jackson.databind.SerializerProvider;
 
 import java.io.IOException;
 

core/src/main/java/org/keycloak/representations/AccessToken.java

@@ -1,7 +1,7 @@
 package org.keycloak.representations;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.io.Serializable;
 import java.util.HashMap;

core/src/main/java/org/keycloak/representations/AccessTokenResponse.java

@@ -1,8 +1,8 @@
 package org.keycloak.representations;
 
-import org.codehaus.jackson.annotate.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import org.codehaus.jackson.annotate.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.HashMap;
 import java.util.Map;

core/src/main/java/org/keycloak/representations/AddressClaimSet.java

@@ -1,6 +1,6 @@
 package org.keycloak.representations;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
 * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

core/src/main/java/org/keycloak/representations/IDToken.java

@@ -1,6 +1,6 @@
 package org.keycloak.representations;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

core/src/main/java/org/keycloak/representations/JsonWebToken.java

@@ -1,11 +1,11 @@
 package org.keycloak.representations;
 
-import org.codehaus.jackson.annotate.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import org.codehaus.jackson.annotate.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import org.keycloak.json.StringOrArrayDeserializer;
 import org.keycloak.json.StringOrArraySerializer;
 import org.keycloak.common.util.Time;

core/src/main/java/org/keycloak/representations/UserInfo.java

@@ -17,7 +17,7 @@
  */
 package org.keycloak.representations;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * @author pedroigor

core/src/main/java/org/keycloak/representations/VersionRepresentation.java

@@ -1,6 +1,6 @@
 package org.keycloak.representations;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.keycloak.common.Version;
 
 /**

core/src/main/java/org/keycloak/representations/adapters/action/AdminAction.java

@@ -1,6 +1,6 @@
 package org.keycloak.representations.adapters.action;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.keycloak.common.util.Time;
 
 /**

core/src/main/java/org/keycloak/representations/adapters/config/AdapterConfig.java

@@ -1,7 +1,7 @@
 package org.keycloak.representations.adapters.config;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * Configuration for Java based adapters

core/src/main/java/org/keycloak/representations/adapters/config/BaseAdapterConfig.java

@@ -1,7 +1,7 @@
 package org.keycloak.representations.adapters.config;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 import java.util.HashMap;
 import java.util.Map;

core/src/main/java/org/keycloak/representations/adapters/config/BaseRealmConfig.java

@@ -1,7 +1,7 @@
 package org.keycloak.representations.adapters.config;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * Common Realm Configuration

core/src/main/java/org/keycloak/representations/idm/GroupRepresentation.java

@@ -1,6 +1,6 @@
 package org.keycloak.representations.idm;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import java.util.Arrays;
 import java.util.HashMap;

core/src/main/java/org/keycloak/representations/idm/PartialImportRepresentation.java

@@ -18,7 +18,7 @@
 package org.keycloak.representations.idm;
 
 import java.util.List;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 /**
  * Used for partial import of users, clients, roles, and identity providers.

core/src/main/java/org/keycloak/representations/idm/PublishedRealmRepresentation.java

@@ -1,8 +1,8 @@
 package org.keycloak.representations.idm;
 
 import org.bouncycastle.openssl.PEMWriter;
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.keycloak.common.util.PemUtils;
 
 import java.io.IOException;

core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java

@@ -1,8 +1,8 @@
 package org.keycloak.representations.idm;
 
-import java.util.*;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+import java.util.*;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

core/src/main/java/org/keycloak/representations/idm/UserRepresentation.java

@@ -1,6 +1,6 @@
 package org.keycloak.representations.idm;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import java.util.Arrays;
 import java.util.HashMap;

core/src/main/java/org/keycloak/representations/oidc/OIDCClientRepresentation.java

@@ -1,6 +1,6 @@
 package org.keycloak.representations.oidc;
 
-import org.codehaus.jackson.annotate.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
 
 import java.util.List;
 

core/src/main/java/org/keycloak/representations/oidc/TokenMetadataRepresentation.java

@@ -17,7 +17,7 @@
  */
 package org.keycloak.representations.oidc;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.keycloak.representations.AccessToken;
 
 /**

core/src/main/java/org/keycloak/util/JsonSerialization.java

@@ -1,12 +1,12 @@
 package org.keycloak.util;
 
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.annotation.JsonInclude;
-import org.codehaus.jackson.JsonParser;
+import com.fasterxml.jackson.core.JsonParser;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.core.type.TypeReference;
-import org.codehaus.jackson.map.SerializationConfig;
+import com.fasterxml.jackson.databind.JsonNode;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+import com.fasterxml.jackson.databind.ObjectMapper;
-import org.codehaus.jackson.node.ObjectNode;
+import com.fasterxml.jackson.databind.SerializationFeature;
-import org.codehaus.jackson.type.TypeReference;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -24,9 +24,9 @@ public class JsonSerialization {
     public static final ObjectMapper sysPropertiesAwareMapper = new ObjectMapper(new SystemPropertiesJsonParserFactory());
 
     static {
-        mapper.setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL);
+        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-        prettyMapper.enable(SerializationConfig.Feature.INDENT_OUTPUT);
+        prettyMapper.enable(SerializationFeature.INDENT_OUTPUT);
-        prettyMapper.setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL);
+        prettyMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
     }
 
     public static void writeValueToStream(OutputStream os, Object obj) throws IOException {

core/src/main/java/org/keycloak/util/SystemPropertiesJsonParserFactory.java

@@ -5,10 +5,10 @@ import java.io.InputStream;
 import java.io.Reader;
 import java.util.Properties;
 
-import org.codehaus.jackson.JsonParser;
+import com.fasterxml.jackson.core.JsonParser;
-import org.codehaus.jackson.io.IOContext;
+import com.fasterxml.jackson.core.io.IOContext;
-import org.codehaus.jackson.map.MappingJsonFactory;
+import com.fasterxml.jackson.core.util.JsonParserDelegate;
-import org.codehaus.jackson.util.JsonParserDelegate;
+import com.fasterxml.jackson.databind.MappingJsonFactory;
 import org.keycloak.common.util.StringPropertyReplacer;
 import org.keycloak.common.util.SystemEnvProperties;
 
@@ -22,20 +22,26 @@ public class SystemPropertiesJsonParserFactory extends MappingJsonFactory {
     private static final Properties properties = new SystemEnvProperties();
 
     @Override
-    protected JsonParser _createJsonParser(byte[] data, int offset, int len, IOContext ctxt) throws IOException {
+    protected JsonParser _createParser(InputStream in, IOContext ctxt) throws IOException {
-        JsonParser delegate = super._createJsonParser(data, offset, len, ctxt);
+        JsonParser delegate =  super._createParser(in, ctxt);
         return new SystemPropertiesAwareJsonParser(delegate);
     }
 
     @Override
-    protected JsonParser _createJsonParser(Reader r, IOContext ctxt) throws IOException {
+    protected JsonParser _createParser(Reader r, IOContext ctxt) throws IOException {
-        JsonParser delegate = super._createJsonParser(r, ctxt);
+        JsonParser delegate =  super._createParser(r, ctxt);
         return new SystemPropertiesAwareJsonParser(delegate);
     }
 
     @Override
-    protected JsonParser _createJsonParser(InputStream in, IOContext ctxt) throws IOException {
+    protected JsonParser _createParser(char[] data, int offset, int len, IOContext ctxt, boolean recyclable) throws IOException {
-        JsonParser delegate = super._createJsonParser(in, ctxt);
+        JsonParser delegate =  super._createParser(data, offset, len, ctxt, recyclable);
+        return new SystemPropertiesAwareJsonParser(delegate);
+    }
+
+    @Override
+    protected JsonParser _createParser(byte[] data, int offset, int len, IOContext ctxt) throws IOException {
+        JsonParser delegate =  super._createParser(data, offset, len, ctxt);
         return new SystemPropertiesAwareJsonParser(delegate);
     }
 

core/src/test/java/org/keycloak/JsonParserTest.java

@@ -7,10 +7,10 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.codehaus.jackson.annotate.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import org.codehaus.jackson.annotate.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
-import org.codehaus.jackson.annotate.JsonUnwrapped;
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import org.junit.Assert;
 import org.junit.Test;
 import org.keycloak.representations.IDToken;

distribution/adapters/as7-eap6-adapter/as7-modules/build.xml

@@ -36,6 +36,23 @@
 
     <target name="modules">
 
+        <!-- jackson2 -->
+
+        <module-def name="com.fasterxml.jackson.core.jackson-annotations">
+            <maven-resource group="com.fasterxml.jackson.core" artifact="jackson-annotations"/>
+        </module-def>
+        <module-def name="com.fasterxml.jackson.core.jackson-core">
+            <maven-resource group="com.fasterxml.jackson.core" artifact="jackson-core"/>
+        </module-def>
+        <module-def name="com.fasterxml.jackson.core.jackson-databind">
+            <maven-resource group="com.fasterxml.jackson.core" artifact="jackson-databind"/>
+        </module-def>
+        <module-def name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider">
+            <maven-resource group="com.fasterxml.jackson.jaxrs" artifact="jackson-jaxrs-json-provider"/>
+            <maven-resource group="com.fasterxml.jackson.jaxrs" artifact="jackson-jaxrs-base"/>
+            <maven-resource group="com.fasterxml.jackson.module" artifact="jackson-module-jaxb-annotations"/>
+        </module-def>
+
         <!-- server min dependencies -->
 
         <module-def name="org.keycloak.keycloak-common">

distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml

@@ -69,6 +69,22 @@
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-json-provider</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/com/fasterxml/jackson/core/jackson-annotations/main/module.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2011, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+<module xmlns="urn:jboss:module:1.1" name="com.fasterxml.jackson.core.jackson-annotations">
+     <resources>
+         <!-- Insert resources here -->
+    </resources>
+
+    <dependencies>
+        <module name="javax.api"/>
+    </dependencies>
+</module>

distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/com/fasterxml/jackson/core/jackson-core/main/module.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2011, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+<module xmlns="urn:jboss:module:1.1" name="com.fasterxml.jackson.core.jackson-core">
+     <resources>
+         <!-- Insert resources here -->
+    </resources>
+
+    <dependencies>
+        <module name="javax.api"/>
+    </dependencies>
+</module>

distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/com/fasterxml/jackson/core/jackson-databind/main/module.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2011, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+<module xmlns="urn:jboss:module:1.1" name="com.fasterxml.jackson.core.jackson-databind">
+     <resources>
+         <!-- Insert resources here -->
+    </resources>
+
+    <dependencies>
+        <module name="javax.api"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
+    </dependencies>
+</module>

distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/main/module.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2011, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+<module xmlns="urn:jboss:module:1.1" name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider">
+     <resources>
+         <!-- Insert resources here -->
+    </resources>
+
+    <dependencies>
+        <module name="javax.api"/>
+        <module name="javax.ws.rs.api"/>
+        <module name="javax.xml.bind.api"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+    </dependencies>
+</module>

distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml

@@ -8,9 +8,10 @@
     </resources>
     <dependencies>
         <module name="javax.api"/>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="org.apache.httpcomponents"/>
         <module name="org.jboss.logging"/>
         <module name="org.keycloak.keycloak-common"/>

distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-as7-adapter/main/module.xml

@@ -9,9 +9,10 @@
     <dependencies>
         <module name="javax.api"/>
         <module name="org.bouncycastle" />
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="org.apache.httpcomponents"/>
         <module name="javax.servlet.api"/>
         <module name="org.jboss.logging"/>

distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml

@@ -7,9 +7,10 @@
         <!-- Insert resources here -->
     </resources>
     <dependencies>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="org.bouncycastle" />
         <module name="org.keycloak.keycloak-common" />
         <module name="javax.api"/>

distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml

@@ -11,6 +11,7 @@
         <fileSet>
             <directory>${project.build.directory}/unpacked</directory>
             <includes>
+                <include>com/fasterxml/jackson/**</include>
                 <include>org/bouncycastle/**</include>
                 <include>org/keycloak/keycloak-common/**</include>
                 <include>org/keycloak/keycloak-core/**</include>

distribution/adapters/osgi/features/src/main/resources/features.xml

@@ -6,9 +6,10 @@
         <bundle dependency="true">mvn:org.keycloak/keycloak-osgi-thirdparty/${project.version}</bundle>
         <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:org.codehaus.jackson/jackson-core-asl/${jackson.version}</bundle>
+        <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
-        <bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson.version}</bundle>
+        <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
-        <bundle dependency="true">mvn:org.codehaus.jackson/jackson-xc/${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-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>
         <bundle>mvn:org.keycloak/keycloak-core/${project.version}</bundle>

distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml

@@ -8,9 +8,10 @@
     </resources>
     <dependencies>
         <module name="javax.api"/>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="org.apache.httpcomponents" slot="4.3" />
         <module name="org.jboss.logging"/>
         <module name="org.keycloak.keycloak-adapter-spi"/>

distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml

@@ -7,9 +7,10 @@
         <!-- Insert resources here -->
     </resources>
     <dependencies>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="org.keycloak.keycloak-common" />
         <module name="org.bouncycastle" />
         <module name="javax.api"/>

distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml

@@ -9,9 +9,10 @@
     <dependencies>
         <module name="javax.api"/>
         <module name="org.bouncycastle" />
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="org.apache.httpcomponents" slot="4.3" />
         <module name="javax.servlet.api"/>
         <module name="org.jboss.logging"/>

distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-adapter/main/module.xml

@@ -9,9 +9,10 @@
     <dependencies>
         <module name="javax.api"/>
         <module name="org.bouncycastle" />
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="org.apache.httpcomponents" slot="4.3" />
         <module name="javax.servlet.api"/>
         <module name="org.jboss.logging"/>

distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml

@@ -8,9 +8,10 @@
     </resources>
     <dependencies>
         <module name="javax.api"/>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="org.apache.httpcomponents"/>
         <module name="org.jboss.logging"/>
         <module name="org.keycloak.keycloak-adapter-spi"/>

distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml

@@ -7,9 +7,10 @@
         <!-- Insert resources here -->
     </resources>
     <dependencies>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="org.keycloak.keycloak-common" />
         <module name="org.bouncycastle" />
         <module name="javax.api"/>

distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml

@@ -9,9 +9,10 @@
     <dependencies>
         <module name="javax.api"/>
         <module name="org.bouncycastle" />
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="org.apache.httpcomponents"/>
         <module name="javax.servlet.api"/>
         <module name="org.jboss.logging"/>

distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-adapter/main/module.xml

@@ -9,9 +9,10 @@
     <dependencies>
         <module name="javax.api"/>
         <module name="org.bouncycastle" />
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="org.apache.httpcomponents"/>
         <module name="javax.servlet.api"/>
         <module name="org.jboss.logging"/>

distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-core/main/module.xml

@@ -8,9 +8,10 @@
     </resources>
     <dependencies>
         <module name="javax.api"/>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="org.apache.httpcomponents" />
         <module name="org.jboss.logging"/>
         <module name="org.keycloak.keycloak-adapter-spi"/>

distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core/main/module.xml

@@ -7,9 +7,10 @@
         <artifact name="${org.keycloak:keycloak-core}"/>
     </resources>
     <dependencies>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="org.keycloak.keycloak-common" />
         <module name="org.bouncycastle" />
         <module name="javax.api"/>

distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-undertow-adapter/main/module.xml

@@ -9,9 +9,10 @@
     <dependencies>
         <module name="javax.api"/>
         <module name="org.bouncycastle" />
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="org.apache.httpcomponents" />
         <module name="javax.servlet.api"/>
         <module name="org.jboss.logging"/>

distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-adapter/main/module.xml

@@ -9,9 +9,10 @@
     <dependencies>
         <module name="javax.api"/>
         <module name="org.bouncycastle" />
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="org.apache.httpcomponents"/>
         <module name="javax.servlet.api"/>
         <module name="org.jboss.logging"/>

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

@@ -14,9 +14,10 @@
         <module name="org.keycloak.keycloak-broker-core"/>
         <module name="org.keycloak.keycloak-services"/>
         <module name="org.keycloak.keycloak-connections-truststore"/>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="org.jboss.logging"/>
         <module name="javax.ws.rs.api"/>
     </dependencies>

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

@@ -7,9 +7,10 @@
         <artifact name="${org.keycloak:keycloak-core}"/>
     </resources>
     <dependencies>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="org.keycloak.keycloak-common"/>
         <module name="org.bouncycastle" />
         <module name="javax.api"/>

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

@@ -13,9 +13,10 @@
         <module name="org.keycloak.keycloak-events-api"/>
         <module name="org.keycloak.keycloak-connections-jpa"/>
         <module name="javax.persistence.api"/>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="org.jboss.logging"/>
         <module name="org.javassist"/>
         <module name="org.hibernate" services="import"/>

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

@@ -13,9 +13,10 @@
         <module name="org.keycloak.keycloak-events-api"/>
         <module name="org.keycloak.keycloak-connections-mongo"/>
         <module name="org.mongodb.mongo-java-driver"/>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="org.jboss.logging"/>
         <module name="javax.api"/>
     </dependencies>

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-api/main/module.xml

@@ -12,9 +12,10 @@
         <module name="org.keycloak.keycloak-model-api"/>
         <module name="org.keycloak.keycloak-invalidation-cache-model"/>
         <module name="javax.ws.rs.api"/>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="org.jboss.resteasy.resteasy-jaxrs"/>
         <module name="org.jboss.logging"/>
         <module name="org.bouncycastle" />

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-dir/main/module.xml

@@ -13,9 +13,10 @@
         <module name="org.keycloak.keycloak-invalidation-cache-model"/>
         <module name="org.keycloak.keycloak-export-import-api"/>
         <module name="javax.ws.rs.api"/>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="org.jboss.resteasy.resteasy-jaxrs"/>
         <module name="org.jboss.logging"/>
         <module name="org.bouncycastle" />

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-single-file/main/module.xml

@@ -13,9 +13,10 @@
         <module name="org.keycloak.keycloak-invalidation-cache-model"/>
         <module name="org.keycloak.keycloak-export-import-api"/>
         <module name="javax.ws.rs.api"/>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="org.jboss.resteasy.resteasy-jaxrs"/>
         <module name="org.jboss.logging"/>
         <module name="org.bouncycastle" />

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml

@@ -48,7 +48,6 @@
             <module name="org.hibernate" services="import"/>
             <module name="org.bouncycastle"/>
 
-            <module name="org.jboss.resteasy.resteasy-jackson-provider" services="import"/>
             <module name="org.jboss.resteasy.resteasy-multipart-provider" services="import"/>
             <module name="org.jboss.resteasy.resteasy-jaxrs"/>
 
@@ -58,8 +57,6 @@
             <module name="org.keycloak.keycloak-server-subsystem.infinispan"/>
         </dependencies>
         <exclusions>
-            <module name="org.jboss.resteasy.resteasy-jackson2-provider"/>
-
             <!-- Exclude keycloak modules -->
             <module name="org.keycloak.keycloak-common" />
             <module name="org.keycloak.keycloak-core" />

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

@@ -64,9 +64,10 @@
         <module name="org.jboss.resteasy.resteasy-crypto"/>
         <module name="org.jboss.resteasy.resteasy-multipart-provider"/>
         <module name="javax.servlet.api"/>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
         <module name="com.google.zxing.core"/>
         <module name="com.google.zxing.javase"/>
         <module name="org.jboss.logging"/>

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

@@ -13,9 +13,10 @@
         <module name="org.keycloak.keycloak-common"/>
         <module name="org.keycloak.keycloak-core"/>
         <module name="javax.api"/>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
     </dependencies>
 
 </module>

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

@@ -15,9 +15,10 @@
         <module name="org.keycloak.keycloak-model-api"/>
         <module name="org.jboss.logging"/>
         <module name="javax.api"/>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
     </dependencies>
 
 </module>

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

@@ -15,9 +15,10 @@
         <module name="org.keycloak.keycloak-model-api"/>
         <module name="org.jboss.logging"/>
         <module name="javax.api"/>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
     </dependencies>
 
 </module>

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

@@ -15,9 +15,10 @@
         <module name="org.keycloak.keycloak-model-api"/>
         <module name="org.jboss.logging"/>
         <module name="javax.api"/>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
     </dependencies>
 
 </module>

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

@@ -15,9 +15,10 @@
         <module name="org.keycloak.keycloak-model-api"/>
         <module name="org.jboss.logging"/>
         <module name="javax.api"/>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
     </dependencies>
 
 </module>

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

@@ -15,9 +15,10 @@
         <module name="org.keycloak.keycloak-model-api"/>
         <module name="org.jboss.logging"/>
         <module name="javax.api"/>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
     </dependencies>
 
 </module>

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

@@ -18,9 +18,10 @@
         <module name="org.jboss.logging"/>
         <module name="javax.api"/>
         <module name="javax.ws.rs.api"/>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
+        <module name="com.fasterxml.jackson.core.jackson-databind"/>
+        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
     </dependencies>
 
 </module>

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

@@ -10,6 +10,7 @@
         <module name="org.keycloak.keycloak-model-api"/>
         <module name="org.jboss.aesh" slot="0.65"/>
         <module name="org.jboss.as.domain-management"/>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="com.fasterxml.jackson.core.jackson-core"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
     </dependencies>
 </module>

events/jpa/pom.xml

@@ -44,13 +44,13 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
+            <artifactId>jackson-databind</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core-asl</artifactId>
+            <artifactId>jackson-core</artifactId>
             <scope>provided</scope>
         </dependency>
    </dependencies>

events/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProvider.java

@@ -1,7 +1,7 @@
 package org.keycloak.events.jpa;
 
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.core.type.TypeReference;
-import org.codehaus.jackson.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.jboss.logging.Logger;
 import org.keycloak.events.admin.AdminEvent;
 import org.keycloak.events.admin.AdminEventQuery;

examples/admin-client/src/main/webapp/WEB-INF/jboss-deployment-structure.xml

@@ -1,10 +0,0 @@
-<jboss-deployment-structure>
-    <deployment>
-        <dependencies>
-            <module name="org.jboss.resteasy.resteasy-jackson-provider" services="import"/>
-        </dependencies>
-        <exclusions>
-            <module name="org.jboss.resteasy.resteasy-jackson2-provider"/>
-        </exclusions>
-    </deployment>
-</jboss-deployment-structure>

examples/broker/twitter-authentication/pom.xml

@@ -35,8 +35,8 @@
             <artifactId>twitter4j-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
+            <artifactId>jackson-databind</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -45,9 +45,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.jboss.resteasy</groupId>
+            <groupId>org.jboss.spec.javax.ws.rs</groupId>
-            <artifactId>jaxrs-api</artifactId>
+            <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
-            <version>3.0.10.Final</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

examples/broker/twitter-authentication/src/main/java/org/keycloak/examples/broker/twitter/TwitterOAuthResponse.java

@@ -17,7 +17,7 @@
  */
 package org.keycloak.examples.broker.twitter;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * @author pedroigor

examples/broker/twitter-authentication/src/main/java/org/keycloak/examples/broker/twitter/TwitterShowUserServlet.java

@@ -17,8 +17,8 @@
  */
 package org.keycloak.examples.broker.twitter;
 
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.databind.JsonNode;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.keycloak.KeycloakSecurityContext;
 import org.keycloak.admin.client.Keycloak;
 import org.keycloak.admin.client.resource.IdentityProvidersResource;

examples/broker/twitter-authentication/src/main/webapp/META-INF/jboss-deployment-structure.xml

@@ -1,10 +0,0 @@
-<jboss-deployment-structure>
-    <deployment>
-        <dependencies>
-            <module name="org.jboss.resteasy.resteasy-jackson-provider" services="import"/>
-        </dependencies>
-        <exclusions>
-            <module name="org.jboss.resteasy.resteasy-jackson2-provider"/>
-        </exclusions>
-    </deployment>
-</jboss-deployment-structure>

examples/demo-template/customer-app-cli/src/main/java/org/keycloak/example/CustomerCli.java

@@ -1,10 +1,10 @@
 package org.keycloak.example;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
 import org.keycloak.adapters.ServerRequest;
 import org.keycloak.adapters.installed.KeycloakInstalled;
 import org.keycloak.common.util.Time;
@@ -23,8 +23,8 @@ public class CustomerCli {
     public static final ObjectMapper mapper = new ObjectMapper();
 
     static {
-        mapper.enable(SerializationConfig.Feature.INDENT_OUTPUT);
+        mapper.enable(SerializationFeature.INDENT_OUTPUT);
-        mapper.setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL);
+        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
     }
 
     private static BufferedReader br;

examples/fuse/cxf-jaxrs/pom.xml

@@ -22,7 +22,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)",
-            org.codehaus.jackson.jaxrs;version="${jackson.version}",
+            com.fasterxml.jackson.jaxrs;version="${jackson.version}",
             org.keycloak.adapters.jetty;version="${project.version}",
             org.keycloak.adapters;version="${project.version}",
             *

examples/fuse/cxf-jaxrs/src/main/resources/OSGI-INF/blueprint/blueprint.xml

@@ -12,7 +12,7 @@
 
     <jaxrs:server id="cxfJaxrsServer" address="/customerservice">
         <jaxrs:providers>
-            <bean class="org.codehaus.jackson.jaxrs.JacksonJsonProvider" />
+            <bean class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider" />
         </jaxrs:providers>
         <jaxrs:serviceBeans>
             <ref component-id="customerBean" />

examples/fuse/features/src/main/resources/features.xml

@@ -8,7 +8,7 @@
         <feature>camel-jetty</feature>
         <feature>cxf</feature>
         <feature>keycloak</feature>
-        <bundle dependency="true">mvn:org.codehaus.jackson/jackson-jaxrs/${jackson.version}</bundle>
+        <bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${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>

export-import/export-import-api/pom.xml

@@ -35,13 +35,13 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core-asl</artifactId>
+            <artifactId>jackson-core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
+            <artifactId>jackson-databind</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/ExportUtils.java

@@ -1,45 +1,18 @@
 package org.keycloak.exportimport.util;
 
+import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import org.keycloak.common.util.Base64;
-import org.codehaus.jackson.JsonEncoding;
+import org.keycloak.models.*;
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.keycloak.models.ClientModel;
-import org.keycloak.models.ClientTemplateModel;
-import org.keycloak.models.GroupModel;
-import org.keycloak.models.KeycloakSession;
-import org.keycloak.models.RealmModel;
-import org.keycloak.models.RoleContainerModel;
-import org.keycloak.models.RoleModel;
-import org.keycloak.models.FederatedIdentityModel;
-import org.keycloak.models.UserConsentModel;
-import org.keycloak.models.UserCredentialValueModel;
-import org.keycloak.models.UserModel;
-import org.keycloak.models.utils.KeycloakModelUtils;
 import org.keycloak.models.utils.ModelToRepresentation;
-import org.keycloak.representations.idm.ClientRepresentation;
+import org.keycloak.representations.idm.*;
-import org.keycloak.representations.idm.ClientTemplateRepresentation;
-import org.keycloak.representations.idm.CredentialRepresentation;
-import org.keycloak.representations.idm.RealmRepresentation;
-import org.keycloak.representations.idm.RoleRepresentation;
-import org.keycloak.representations.idm.RolesRepresentation;
-import org.keycloak.representations.idm.ScopeMappingRepresentation;
-import org.keycloak.representations.idm.FederatedIdentityRepresentation;
-import org.keycloak.representations.idm.UserConsentRepresentation;
-import org.keycloak.representations.idm.UserRepresentation;
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
@@ -340,10 +313,10 @@ public class ExportUtils {
     // Streaming API
 
     public static void exportUsersToStream(KeycloakSession session, RealmModel realm, List<UserModel> usersToExport, ObjectMapper mapper, OutputStream os) throws IOException {
-        JsonFactory factory = mapper.getJsonFactory();
+        JsonFactory factory = mapper.getFactory();
-        JsonGenerator generator = factory.createJsonGenerator(os, JsonEncoding.UTF8);
+        JsonGenerator generator = factory.createGenerator(os, JsonEncoding.UTF8);
         try {
-            if (mapper.isEnabled(SerializationConfig.Feature.INDENT_OUTPUT)) {
+            if (mapper.isEnabled(SerializationFeature.INDENT_OUTPUT)) {
                 generator.useDefaultPrettyPrinter();
             }
             generator.writeStartObject();

export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/ImportUtils.java

@@ -1,19 +1,17 @@
 package org.keycloak.exportimport.util;
 
-import org.codehaus.jackson.JsonFactory;
+import com.fasterxml.jackson.core.JsonFactory;
-import org.codehaus.jackson.JsonParser;
+import com.fasterxml.jackson.core.JsonParser;
-import org.codehaus.jackson.JsonToken;
+import com.fasterxml.jackson.core.JsonToken;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.jboss.logging.Logger;
 import org.keycloak.Config;
+import org.keycloak.exportimport.ExportImportConfig;
 import org.keycloak.exportimport.Strategy;
-import org.keycloak.models.AdminRoles;
 import org.keycloak.models.ClientModel;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
 import org.keycloak.models.RealmProvider;
-import org.keycloak.models.RoleModel;
-import org.keycloak.models.utils.KeycloakModelUtils;
 import org.keycloak.models.utils.RealmImporter;
 import org.keycloak.models.utils.RepresentationToModel;
 import org.keycloak.representations.idm.RealmRepresentation;
@@ -23,8 +21,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
 
-import org.keycloak.exportimport.ExportImportConfig;
-
 /**
  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
  */
@@ -104,8 +100,8 @@ public class ImportUtils {
     public static Map<String, RealmRepresentation> getRealmsFromStream(ObjectMapper mapper, InputStream is) throws IOException {
         Map<String, RealmRepresentation> result = new HashMap<String, RealmRepresentation>();
 
-        JsonFactory factory = mapper.getJsonFactory();
+        JsonFactory factory = mapper.getFactory();
-        JsonParser parser = factory.createJsonParser(is);
+        JsonParser parser = factory.createParser(is);
         try {
             parser.nextToken();
 

export-import/export-import-dir/pom.xml

@@ -30,13 +30,13 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core-asl</artifactId>
+            <artifactId>jackson-core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
+            <artifactId>jackson-databind</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

export-import/export-import-single-file/pom.xml

@@ -30,13 +30,13 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core-asl</artifactId>
+            <artifactId>jackson-core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
+            <artifactId>jackson-databind</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

export-import/export-import-single-file/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java

@@ -1,6 +1,6 @@
 package org.keycloak.exportimport.singlefile;
 
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.jboss.logging.Logger;
 import org.keycloak.exportimport.ExportProvider;
 import org.keycloak.exportimport.util.ExportImportSessionTask;

forms/account-api/pom.xml

@@ -30,8 +30,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.jboss.resteasy</groupId>
+			<groupId>org.jboss.spec.javax.ws.rs</groupId>
-            <artifactId>jaxrs-api</artifactId>
+			<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

forms/common-themes/pom.xml

@@ -30,8 +30,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.jboss.resteasy</groupId>
+            <groupId>org.jboss.spec.javax.ws.rs</groupId>
-            <artifactId>jaxrs-api</artifactId>
+            <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -45,8 +45,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core-asl</artifactId>
+            <artifactId>jackson-core</artifactId>
             <scope>provided</scope>
         </dependency>
 	</dependencies>

forms/login-api/pom.xml

@@ -25,8 +25,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.jboss.resteasy</groupId>
+			<groupId>org.jboss.spec.javax.ws.rs</groupId>
-            <artifactId>jaxrs-api</artifactId>
+			<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

integration/adapter-core/pom.xml

@@ -49,18 +49,18 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core-asl</artifactId>
+            <artifactId>jackson-core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
+            <artifactId>jackson-databind</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-xc</artifactId>
+            <artifactId>jackson-annotations</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>