#61

GluuFederation · May 13, 2019 · b983f21 · b983f21
1 parent d280e0f
commit b983f21
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -140,14 +140,14 @@
             <version>1.8.3</version>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-core-asl</artifactId>
-            <version>${jackson.version}</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.9.8</version>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-            <version>${jackson.version}</version>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jackson2-provider</artifactId>
+            <version>${resteasy.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>

diff --git a/src/main/java/gluu/scim2/client/TestModeScimClient.java b/src/main/java/gluu/scim2/client/TestModeScimClient.java
@@ -5,10 +5,11 @@
  */
 package gluu.scim2.client;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.map.ObjectMapper;
 import org.gluu.oxauth.model.common.*;
 import org.gluu.oxauth.model.register.ApplicationType;
 import org.gluu.oxauth.model.util.Util;

diff --git a/src/main/java/gluu/scim2/client/rest/provider/ListResponseProvider.java b/src/main/java/gluu/scim2/client/rest/provider/ListResponseProvider.java
@@ -5,10 +5,10 @@
  */
 package gluu.scim2.client.rest.provider;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
 import org.gluu.oxtrust.model.scim2.BaseScimResource;
 import org.gluu.oxtrust.model.scim2.ListResponse;
 import org.gluu.oxtrust.model.scim2.util.IntrospectUtil;

diff --git a/src/main/java/gluu/scim2/client/rest/provider/ScimResourceProvider.java b/src/main/java/gluu/scim2/client/rest/provider/ScimResourceProvider.java
@@ -1,6 +1,6 @@
 package gluu.scim2.client.rest.provider;
 
-import org.codehaus.jackson.jaxrs.JacksonJsonProvider;
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.Produces;

diff --git a/src/test/java/gluu/scim2/client/BaseTest.java b/src/test/java/gluu/scim2/client/BaseTest.java
@@ -1,12 +1,11 @@
 package gluu.scim2.client;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import gluu.scim2.client.factory.ScimClientFactory;
 import gluu.scim2.client.rest.ClientSideService;
-import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
 import org.gluu.oxauth.model.util.SecurityProviderUtility;
 import org.gluu.oxtrust.model.scim2.user.UserResource;
 import org.testng.ITestContext;
@@ -57,7 +56,7 @@ public void initTestSuite(ITestContext context) throws Exception {
 
         if (client==null) {
             setupClient(context.getSuite().getXmlSuite().getParameters());
-            mapper.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
+            mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
         }
 
     }

diff --git a/src/test/java/gluu/scim2/client/bulk/GroupsBulkTest.java b/src/test/java/gluu/scim2/client/bulk/GroupsBulkTest.java
@@ -5,8 +5,8 @@
  */
 package gluu.scim2.client.bulk;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import gluu.scim2.client.BaseTest;
-import org.codehaus.jackson.type.TypeReference;
 import org.gluu.oxtrust.model.scim2.ListResponse;
 import org.gluu.oxtrust.model.scim2.SearchRequest;
 import org.gluu.oxtrust.model.scim2.bulk.BulkOperation;

diff --git a/src/test/resources/testng.xml b/src/test/resources/testng.xml
@@ -99,4 +99,4 @@
         </classes>
     </test>
 
-</suite>
+</suite>
diff --git a/src/test/resources/testng2.properties b/src/test/resources/testng2.properties
@@ -57,4 +57,4 @@ search_multiple_2=file:target/test-classes/multiple/search_post_2.json
 #bulk requests
 users_bulk1=file:target/test-classes/multiple/users_bulk_1.json
 users_bulk2=file:target/test-classes/multiple/users_bulk_2.json
-groups_bulk=file:target/test-classes/multiple/groups_bulk.json
+groups_bulk=file:target/test-classes/multiple/groups_bulk.json