diff --git a/common/src/main/java/com/ifountain/opsgenie/client/script/util/ScriptBridgeUtils.java b/common/src/main/java/com/ifountain/opsgenie/client/script/util/ScriptBridgeUtils.java
index e55f8492..9f3944eb 100644
--- a/common/src/main/java/com/ifountain/opsgenie/client/script/util/ScriptBridgeUtils.java
+++ b/common/src/main/java/com/ifountain/opsgenie/client/script/util/ScriptBridgeUtils.java
@@ -1,12 +1,12 @@
 package com.ifountain.opsgenie.client.script.util;
 
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.ifountain.opsgenie.client.script.util.deserializer.RecipientDeserializer;
 import com.ifountain.opsgenie.client.util.JsonUtils;
 import com.opsgenie.oas.sdk.model.Recipient;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.Version;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.module.SimpleModule;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 
@@ -160,7 +160,7 @@ public static List<Recipient> getAsRecipientList(Map params, String propName) th
         if (objectList != null) {
             for (Map objectEntry : objectList) {
                 JsonNode jsonNode = mapper.valueToTree(objectEntry);
-                listElements.add(mapper.readValue(jsonNode, Recipient.class));
+                listElements.add(mapper.readValue(String.valueOf(jsonNode), Recipient.class));
             }
             return listElements;
         }
@@ -170,7 +170,7 @@ public static List<Recipient> getAsRecipientList(Map params, String propName) th
     public static Recipient getAsRecipient(Map params) throws Exception {
 
         JsonNode jsonNode = mapper.valueToTree(params);
-        return mapper.readValue(jsonNode, Recipient.class);
+        return mapper.readValue(String.valueOf(jsonNode), Recipient.class);
 
     }
 }
diff --git a/common/src/main/java/com/ifountain/opsgenie/client/script/util/deserializer/RecipientDeserializer.java b/common/src/main/java/com/ifountain/opsgenie/client/script/util/deserializer/RecipientDeserializer.java
index 062243df..fcf11c65 100644
--- a/common/src/main/java/com/ifountain/opsgenie/client/script/util/deserializer/RecipientDeserializer.java
+++ b/common/src/main/java/com/ifountain/opsgenie/client/script/util/deserializer/RecipientDeserializer.java
@@ -1,13 +1,14 @@
 package com.ifountain.opsgenie.client.script.util.deserializer;
 
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 import com.ifountain.opsgenie.client.OpsGenieClientConstants;
 import com.ifountain.opsgenie.client.util.JsonUtils;
 import com.opsgenie.oas.sdk.model.*;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.map.DeserializationContext;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 
 import java.io.IOException;
 import java.text.ParseException;
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 3d0dee6e..deedc7fa 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradlew.bat b/gradlew.bat
index 8a0b282a..aec99730 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,90 +1,90 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/sdk/build.gradle b/sdk/build.gradle
index 648f4325..6df977ed 100644
--- a/sdk/build.gradle
+++ b/sdk/build.gradle
@@ -6,8 +6,7 @@ dependencies {
     compile 'org.apache.httpcomponents:httpcore:4.2.5'
     compile 'org.apache.httpcomponents:httpmime:4.2.5'
     compile 'org.apache.httpcomponents:httpclient:4.2.5'
-    compile 'org.codehaus.jackson:jackson-mapper-lgpl:1.9.3'
-
+    compile "com.fasterxml.jackson.core:jackson-databind:2.9.10.8"
     testCompile project(':test')
 }
 
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseRequest.java
index 1313f86f..50e6f1dc 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseRequest.java
@@ -1,12 +1,12 @@
 package com.ifountain.opsgenie.client.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.ifountain.opsgenie.client.OpsGenieClientConstants;
 import com.ifountain.opsgenie.client.OpsGenieClientValidationException;
 import com.ifountain.opsgenie.client.util.JsonUtils;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 
 import java.util.Map;
 
@@ -16,7 +16,7 @@
  *
  * @author Sezgin Kucukkaraaslan
  */
-@JsonSerialize(include = Inclusion.NON_NULL)
+@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
 @JsonPropertyOrder(alphabetic = true)
 public abstract class BaseRequest<T extends BaseResponse,K extends BaseRequest> implements Request {
     private String apiKey;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseRequestWithHttpParameters.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseRequestWithHttpParameters.java
index a0882fcf..d494c0da 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseRequestWithHttpParameters.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseRequestWithHttpParameters.java
@@ -1,6 +1,6 @@
 package com.ifountain.opsgenie.client.model;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import java.util.Map;
 
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseResponse.java
index 326ffd52..8f040906 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseResponse.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/BaseResponse.java
@@ -1,8 +1,9 @@
 package com.ifountain.opsgenie.client.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.ifountain.opsgenie.client.util.JsonUtils;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+
 
 import java.io.IOException;
 import java.text.ParseException;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/ObjectWithTimeZone.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/ObjectWithTimeZone.java
index b4da853c..2199ec43 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/ObjectWithTimeZone.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/ObjectWithTimeZone.java
@@ -1,6 +1,6 @@
 package com.ifountain.opsgenie.client.model;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import java.util.TimeZone;
 
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/Request.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/Request.java
index 417b9ac3..744bccd0 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/Request.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/Request.java
@@ -1,6 +1,7 @@
 package com.ifountain.opsgenie.client.model;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 /**
  * Interface for OpsGenie service api requests.
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/account/GetAccountInfoResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/account/GetAccountInfoResponse.java
index d9ef519b..007ba514 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/account/GetAccountInfoResponse.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/account/GetAccountInfoResponse.java
@@ -2,7 +2,7 @@
 
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.Account;
-import org.codehaus.jackson.annotate.JsonUnwrapped;
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
 
 /**
  * Represents OpsGenie service response for get account request.
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/AlertsRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/AlertsRequest.java
index f2044aba..73c25458 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/AlertsRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/AlertsRequest.java
@@ -2,7 +2,7 @@
 
 import com.ifountain.opsgenie.client.model.BaseRequest;
 import com.ifountain.opsgenie.client.model.BaseResponse;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.List;
 
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/BaseAlertRequestWithId.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/BaseAlertRequestWithId.java
index 9c1086f9..c5c60a14 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/BaseAlertRequestWithId.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/BaseAlertRequestWithId.java
@@ -1,8 +1,8 @@
 package com.ifountain.opsgenie.client.model.alert;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.ifountain.opsgenie.client.model.BaseRequest;
 import com.ifountain.opsgenie.client.model.BaseResponse;
-import org.codehaus.jackson.annotate.JsonIgnore;
 
 /**
  * Abstract Container for the alert requests.
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/GetAlertResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/GetAlertResponse.java
index 3b61f1f9..b1904019 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/GetAlertResponse.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/GetAlertResponse.java
@@ -1,8 +1,8 @@
 package com.ifountain.opsgenie.client.model.alert;
 
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.Alert;
-import org.codehaus.jackson.annotate.JsonUnwrapped;
 
 /**
  * Represents the OpsGenie service response for an get alert request.
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertLogsRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertLogsRequest.java
index dd8860a5..dde1f826 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertLogsRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertLogsRequest.java
@@ -2,7 +2,7 @@
 
 import com.ifountain.opsgenie.client.OpsGenieClientConstants;
 import com.ifountain.opsgenie.client.OpsGenieClientValidationException;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Container for the parameters to make a list alert logs api call.
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertLogsResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertLogsResponse.java
index e32b823d..f3a10b2a 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertLogsResponse.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertLogsResponse.java
@@ -2,7 +2,7 @@
 
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.AlertLog;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.List;
 
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertNotesRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertNotesRequest.java
index 2164609c..2c55fe7c 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertNotesRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertNotesRequest.java
@@ -2,7 +2,7 @@
 
 import com.ifountain.opsgenie.client.OpsGenieClientConstants;
 import com.ifountain.opsgenie.client.OpsGenieClientValidationException;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Container for the parameters to make a list alert notes api call.
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertNotesResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertNotesResponse.java
index 9f1ecf82..6ba0c364 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertNotesResponse.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertNotesResponse.java
@@ -2,7 +2,7 @@
 
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.AlertNote;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.List;
 
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertsRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertsRequest.java
index 80a8760f..bcafdbf0 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertsRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/ListAlertsRequest.java
@@ -1,6 +1,7 @@
 package com.ifountain.opsgenie.client.model.alert;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Container for the parameters to make a list alerts api call.
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/RemoveDetailsRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/RemoveDetailsRequest.java
index 6a0c534d..dc55d588 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/RemoveDetailsRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/RemoveDetailsRequest.java
@@ -1,7 +1,7 @@
 package com.ifountain.opsgenie.client.model.alert;
 
 import com.ifountain.opsgenie.client.util.Strings;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.List;
 
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/RemoveTagsRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/RemoveTagsRequest.java
index 8af7f6c3..aa042e43 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/RemoveTagsRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/RemoveTagsRequest.java
@@ -1,7 +1,7 @@
 package com.ifountain.opsgenie.client.model.alert;
 
 import com.ifountain.opsgenie.client.util.Strings;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.List;
 
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/SnoozeRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/SnoozeRequest.java
index 4c1622f7..470b2292 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/SnoozeRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alert/SnoozeRequest.java
@@ -1,7 +1,7 @@
 package com.ifountain.opsgenie.client.model.alert;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ifountain.opsgenie.client.model.ObjectWithTimeZone;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 import java.util.Date;
 import java.util.TimeZone;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alertpolicy/EnableAlertPolicyRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alertpolicy/EnableAlertPolicyRequest.java
index 3a7b1ced..ac17c195 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/alertpolicy/EnableAlertPolicyRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/alertpolicy/EnableAlertPolicyRequest.java
@@ -1,8 +1,8 @@
 package com.ifountain.opsgenie.client.model.alertpolicy;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.ifountain.opsgenie.client.model.BaseRequest;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
 
 /**
  * Container for the parameters to enable/disable  alert policy.
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Alert.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Alert.java
index f6841393..c10b1008 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Alert.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Alert.java
@@ -1,6 +1,7 @@
 package com.ifountain.opsgenie.client.model.beans;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.List;
 import java.util.Map;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Bean.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Bean.java
index fd1b9228..ecca8894 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Bean.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Bean.java
@@ -1,16 +1,16 @@
 package com.ifountain.opsgenie.client.model.beans;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.ifountain.opsgenie.client.util.JsonUtils;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
 
 import java.text.ParseException;
 import java.util.Map;
 
 @JsonPropertyOrder(alphabetic = true)
-@JsonSerialize(include = Inclusion.NON_NULL)
+@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public abstract class Bean implements IBean {
 
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Condition.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Condition.java
index a564f5dd..0f1ef0ca 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Condition.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Condition.java
@@ -1,9 +1,9 @@
 package com.ifountain.opsgenie.client.model.beans;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 import com.ifountain.opsgenie.client.OpsGenieClientConstants;
 
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonValue;
 
 /**
  * Condition bean
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Contact.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Contact.java
index 3c2c8bc1..fe74b4e6 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Contact.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Contact.java
@@ -1,9 +1,10 @@
 package com.ifountain.opsgenie.client.model.beans;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 import com.ifountain.opsgenie.client.OpsGenieClientConstants;
 
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonValue;
+
 
 /**
  * Contact bean
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/EscalationRule.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/EscalationRule.java
index 1f16289d..46e80035 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/EscalationRule.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/EscalationRule.java
@@ -1,7 +1,8 @@
 package com.ifountain.opsgenie.client.model.beans;
 
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonValue;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 
 public class EscalationRule extends Bean {
     private String notify;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Forwarding.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Forwarding.java
index 1d6387b9..9457cbdd 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Forwarding.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Forwarding.java
@@ -1,9 +1,9 @@
 package com.ifountain.opsgenie.client.model.beans;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ifountain.opsgenie.client.OpsGenieClientConstants;
 import com.ifountain.opsgenie.client.model.ConvertFromTimeZone;
 
-import org.codehaus.jackson.annotate.JsonProperty;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/NotificationRule.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/NotificationRule.java
index 7f0984a9..8095438f 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/NotificationRule.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/NotificationRule.java
@@ -1,9 +1,9 @@
 package com.ifountain.opsgenie.client.model.beans;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 import com.ifountain.opsgenie.client.OpsGenieClientConstants;
 
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonValue;
 
 import java.util.List;
 
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Schedule.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Schedule.java
index 71cb78bd..10156a00 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Schedule.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/Schedule.java
@@ -3,7 +3,7 @@
 import com.ifountain.opsgenie.client.OpsGenieClientConstants;
 import com.ifountain.opsgenie.client.model.ConvertFromTimeZone;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleOverride.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleOverride.java
index f432f133..fd1d4c21 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleOverride.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleOverride.java
@@ -3,7 +3,7 @@
 import com.ifountain.opsgenie.client.OpsGenieClientConstants;
 import com.ifountain.opsgenie.client.model.ConvertFromTimeZone;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRestrictionTime.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRestrictionTime.java
index 5b53e008..6bda74cf 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRestrictionTime.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRestrictionTime.java
@@ -1,7 +1,8 @@
 package com.ifountain.opsgenie.client.model.beans;
 
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonValue;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 
 @Deprecated
 public class ScheduleRestrictionTime {
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRotation.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRotation.java
index 54a9d565..2bff618e 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRotation.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRotation.java
@@ -2,8 +2,8 @@
 
 import com.ifountain.opsgenie.client.model.ObjectWithTimeZone;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRotationRestriction.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRotationRestriction.java
index f17b84ea..2c034e21 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRotationRestriction.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/ScheduleRotationRestriction.java
@@ -1,8 +1,8 @@
 package com.ifountain.opsgenie.client.model.beans;
 
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonValue;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonValue;
 
 /**
  * ScheduleRotationRestriction bean
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/User.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/User.java
index 83f2d640..856e0ec6 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/User.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/User.java
@@ -1,11 +1,11 @@
 package com.ifountain.opsgenie.client.model.beans;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
 import com.ifountain.opsgenie.client.util.JsonUtils;
 
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.annotate.JsonValue;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/UserRole.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/UserRole.java
index b26462a5..9d564427 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/UserRole.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/UserRole.java
@@ -1,7 +1,8 @@
 package com.ifountain.opsgenie.client.model.beans;
 
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonValue;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 
 /**
  * UserRole bean Users can use standard roles (admin-owner-user) or they can create their own custom
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/WhoIsOnCall.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/WhoIsOnCall.java
index a39de642..1ef7cb60 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/WhoIsOnCall.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/beans/WhoIsOnCall.java
@@ -1,6 +1,6 @@
 package com.ifountain.opsgenie.client.model.beans;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.List;
 
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/contact/GetContactResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/contact/GetContactResponse.java
index 2c2fab62..2f1d0847 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/contact/GetContactResponse.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/contact/GetContactResponse.java
@@ -1,8 +1,8 @@
 package com.ifountain.opsgenie.client.model.contact;
 
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.Contact;
-import org.codehaus.jackson.annotate.JsonUnwrapped;
 
 /**
  * Represents OpsGenie service response for get contact request.
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/EnableHeartbeatRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/EnableHeartbeatRequest.java
index 85cd04f8..67cdb5fb 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/EnableHeartbeatRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/EnableHeartbeatRequest.java
@@ -2,7 +2,7 @@
 
 import com.ifountain.opsgenie.client.model.BaseRequest;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 /**
  * Container for the parameters to make a enable/disable heartbeat monitor api call.
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/GetHeartbeatResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/GetHeartbeatResponse.java
index 8d1707f2..37af3cc3 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/GetHeartbeatResponse.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/GetHeartbeatResponse.java
@@ -2,7 +2,7 @@
 
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.Heartbeat;
-import org.codehaus.jackson.annotate.JsonUnwrapped;
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
 
 /**
  * Represents OpsGenie service response for get heartbeat request.
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/HeartbeatRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/HeartbeatRequest.java
index 70afc38c..2ee3b8cd 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/HeartbeatRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/customer/HeartbeatRequest.java
@@ -2,7 +2,7 @@
 
 import com.ifountain.opsgenie.client.model.BaseRequest;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 /**
  * Container for the parameters to make a heartbeat api call.
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/escalation/GetEscalationResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/escalation/GetEscalationResponse.java
index a4ee0132..a66d040e 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/escalation/GetEscalationResponse.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/escalation/GetEscalationResponse.java
@@ -1,8 +1,8 @@
 package com.ifountain.opsgenie.client.model.escalation;
 
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.Escalation;
-import org.codehaus.jackson.annotate.JsonUnwrapped;
 
 /**
  * Represents OpsGenie service response for get escalation request.
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/group/AddGroupMemberRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/group/AddGroupMemberRequest.java
index a92ecdd8..6193a6a1 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/group/AddGroupMemberRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/group/AddGroupMemberRequest.java
@@ -1,9 +1,9 @@
 package com.ifountain.opsgenie.client.model.group;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ifountain.opsgenie.client.model.BaseRequest;
 import com.ifountain.opsgenie.client.util.Strings;
 
-import org.codehaus.jackson.annotate.JsonProperty;
 
 import java.util.List;
 
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/group/GetGroupResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/group/GetGroupResponse.java
index 1a34c51d..4f532006 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/group/GetGroupResponse.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/group/GetGroupResponse.java
@@ -1,8 +1,8 @@
 package com.ifountain.opsgenie.client.model.group;
 
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.Group;
-import org.codehaus.jackson.annotate.JsonUnwrapped;
 
 /**
  * Represents OpsGenie service response for get group request.
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/integration/EnableIntegrationRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/integration/EnableIntegrationRequest.java
index 27f80d5e..5e1441f1 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/integration/EnableIntegrationRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/integration/EnableIntegrationRequest.java
@@ -2,7 +2,7 @@
 
 import com.ifountain.opsgenie.client.model.BaseRequest;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 /**
  * Container for the parameters to make an enable/disable integration api call.
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/integration/SendToIntegrationRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/integration/SendToIntegrationRequest.java
index d753e21b..ae29ba42 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/integration/SendToIntegrationRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/integration/SendToIntegrationRequest.java
@@ -2,7 +2,7 @@
 
 import com.ifountain.opsgenie.client.model.BaseRequestWithHttpParameters;
 
-import org.codehaus.jackson.annotate.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
 
 import java.util.Map;
 
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/notification_rule/GetNotificationRuleResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/notification_rule/GetNotificationRuleResponse.java
index 51159ecb..3e68f35c 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/notification_rule/GetNotificationRuleResponse.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/notification_rule/GetNotificationRuleResponse.java
@@ -1,8 +1,8 @@
 package com.ifountain.opsgenie.client.model.notification_rule;
 
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.NotificationRule;
-import org.codehaus.jackson.annotate.JsonUnwrapped;
 
 /**
  * Represents OpsGenie service response for get notificationRule request.
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AbstractWhoIsOnCallRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AbstractWhoIsOnCallRequest.java
index c11fb968..05891098 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AbstractWhoIsOnCallRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AbstractWhoIsOnCallRequest.java
@@ -1,10 +1,10 @@
 package com.ifountain.opsgenie.client.model.schedule;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ifountain.opsgenie.client.model.BaseRequest;
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.ObjectWithTimeZone;
 
-import org.codehaus.jackson.annotate.JsonProperty;
 
 import java.util.Date;
 import java.util.TimeZone;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AddScheduleOverrideRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AddScheduleOverrideRequest.java
index 73c13de9..3b209a4a 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AddScheduleOverrideRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AddScheduleOverrideRequest.java
@@ -3,7 +3,7 @@
 import com.ifountain.opsgenie.client.model.BaseRequest;
 import com.ifountain.opsgenie.client.model.ObjectWithTimeZone;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.Date;
 import java.util.List;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AddScheduleRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AddScheduleRequest.java
index f891c3b5..fa49f217 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AddScheduleRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/AddScheduleRequest.java
@@ -1,10 +1,10 @@
 package com.ifountain.opsgenie.client.model.schedule;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ifountain.opsgenie.client.model.BaseRequest;
 import com.ifountain.opsgenie.client.model.ObjectWithTimeZone;
 import com.ifountain.opsgenie.client.model.beans.ScheduleRotation;
 
-import org.codehaus.jackson.annotate.JsonProperty;
 
 import java.util.List;
 import java.util.TimeZone;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ExportScheduleRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ExportScheduleRequest.java
index 674feab1..f4e05103 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ExportScheduleRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ExportScheduleRequest.java
@@ -2,7 +2,7 @@
 
 import com.ifountain.opsgenie.client.model.BaseRequest;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.TimeZone;
 
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/FlatWhoIsOnCallResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/FlatWhoIsOnCallResponse.java
index 863ddeff..ca5fb159 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/FlatWhoIsOnCallResponse.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/FlatWhoIsOnCallResponse.java
@@ -1,8 +1,10 @@
 package com.ifountain.opsgenie.client.model.schedule;
 
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
+
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.FlatWhoIsOnCall;
-import org.codehaus.jackson.annotate.JsonUnwrapped;
 
 /**
  * Represents OpsGenie service response for flat who is on call request.
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/GetScheduleOverrideResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/GetScheduleOverrideResponse.java
index 367f264b..8fb6bd34 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/GetScheduleOverrideResponse.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/GetScheduleOverrideResponse.java
@@ -2,7 +2,7 @@
 
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.ScheduleOverride;
-import org.codehaus.jackson.annotate.JsonUnwrapped;
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
 
 import java.io.IOException;
 import java.text.ParseException;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/GetScheduleResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/GetScheduleResponse.java
index d0833cbe..1c1a2273 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/GetScheduleResponse.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/GetScheduleResponse.java
@@ -1,8 +1,8 @@
 package com.ifountain.opsgenie.client.model.schedule;
 
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.Schedule;
-import org.codehaus.jackson.annotate.JsonUnwrapped;
 
 import java.io.IOException;
 import java.text.ParseException;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListFlatWhoIsOnCallResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListFlatWhoIsOnCallResponse.java
index bfa3e663..068093de 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListFlatWhoIsOnCallResponse.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListFlatWhoIsOnCallResponse.java
@@ -2,7 +2,7 @@
 
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.FlatWhoIsOnCall;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.List;
 
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListScheduleOverridesResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListScheduleOverridesResponse.java
index 0e00e39e..8d1403d9 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListScheduleOverridesResponse.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListScheduleOverridesResponse.java
@@ -2,7 +2,7 @@
 
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.ScheduleOverride;
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import java.io.IOException;
 import java.text.ParseException;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListWhoIsOnCallResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListWhoIsOnCallResponse.java
index 044b5f1a..747c598e 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListWhoIsOnCallResponse.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/ListWhoIsOnCallResponse.java
@@ -1,8 +1,9 @@
 package com.ifountain.opsgenie.client.model.schedule;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.WhoIsOnCall;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 import java.util.List;
 
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/UpdateScheduleRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/UpdateScheduleRequest.java
index 914713bc..3a24d370 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/UpdateScheduleRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/UpdateScheduleRequest.java
@@ -1,12 +1,12 @@
 package com.ifountain.opsgenie.client.model.schedule;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ifountain.opsgenie.client.OpsGenieClientConstants;
 import com.ifountain.opsgenie.client.OpsGenieClientValidationException;
 import com.ifountain.opsgenie.client.model.BaseRequest;
 import com.ifountain.opsgenie.client.model.ObjectWithTimeZone;
 import com.ifountain.opsgenie.client.model.beans.ScheduleRotation;
 
-import org.codehaus.jackson.annotate.JsonProperty;
 
 import java.util.List;
 import java.util.TimeZone;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/WhoIsOnCallResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/WhoIsOnCallResponse.java
index 3e8dea3a..7ffc5357 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/WhoIsOnCallResponse.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/schedule/WhoIsOnCallResponse.java
@@ -1,8 +1,8 @@
 package com.ifountain.opsgenie.client.model.schedule;
 
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.WhoIsOnCall;
-import org.codehaus.jackson.annotate.JsonUnwrapped;
 
 /**
  * Represents OpsGenie service response for who is on call request.
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/GetTeamResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/GetTeamResponse.java
index 99e59871..de42d245 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/GetTeamResponse.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/GetTeamResponse.java
@@ -1,8 +1,8 @@
 package com.ifountain.opsgenie.client.model.team;
 
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.Team;
-import org.codehaus.jackson.annotate.JsonUnwrapped;
 
 /**
  * Represents OpsGenie service response for get team request.
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/ListTeamLogsRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/ListTeamLogsRequest.java
index ea0129b0..f783089c 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/ListTeamLogsRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/ListTeamLogsRequest.java
@@ -1,7 +1,7 @@
 package com.ifountain.opsgenie.client.model.team;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ifountain.opsgenie.client.model.BaseRequest;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  * Container for the parameters to make a list team logs api call.
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/ListTeamLogsResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/ListTeamLogsResponse.java
index 28542316..d395b439 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/ListTeamLogsResponse.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/ListTeamLogsResponse.java
@@ -1,8 +1,8 @@
 package com.ifountain.opsgenie.client.model.team;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.TeamLog;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 import java.util.List;
 
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/routing_rule/GetTeamRoutingRuleResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/routing_rule/GetTeamRoutingRuleResponse.java
index b04765c4..7bef2de4 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/routing_rule/GetTeamRoutingRuleResponse.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/team/routing_rule/GetTeamRoutingRuleResponse.java
@@ -1,8 +1,8 @@
 package com.ifountain.opsgenie.client.model.team.routing_rule;
 
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.TeamRoutingRule;
-import org.codehaus.jackson.annotate.JsonUnwrapped;
 
 /**
  * Represents OpsGenie service response for get TeamRoutingRules request.
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/AddUserRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/AddUserRequest.java
index 62893a39..0773bf84 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/AddUserRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/AddUserRequest.java
@@ -1,11 +1,11 @@
 package com.ifountain.opsgenie.client.model.user;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ifountain.opsgenie.client.model.BaseRequest;
 import com.ifountain.opsgenie.client.model.beans.User;
 import com.ifountain.opsgenie.client.model.beans.UserRole;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 import java.util.Locale;
 import java.util.TimeZone;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/GetUserResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/GetUserResponse.java
index 4a4a7679..23d6cbb4 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/GetUserResponse.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/GetUserResponse.java
@@ -1,8 +1,8 @@
 package com.ifountain.opsgenie.client.model.user;
 
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.User;
-import org.codehaus.jackson.annotate.JsonUnwrapped;
 
 /**
  * Represents OpsGenie service response for get user request.
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/UpdateUserRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/UpdateUserRequest.java
index 7a90923c..c1812553 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/UpdateUserRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/UpdateUserRequest.java
@@ -1,13 +1,13 @@
 package com.ifountain.opsgenie.client.model.user;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ifountain.opsgenie.client.OpsGenieClientConstants;
 import com.ifountain.opsgenie.client.OpsGenieClientValidationException;
 import com.ifountain.opsgenie.client.model.BaseRequest;
 import com.ifountain.opsgenie.client.model.beans.User;
 import com.ifountain.opsgenie.client.model.beans.UserRole;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 import java.util.Locale;
 import java.util.TimeZone;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/AddForwardingRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/AddForwardingRequest.java
index 3affbf84..4a63ff55 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/AddForwardingRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/AddForwardingRequest.java
@@ -3,7 +3,7 @@
 import com.ifountain.opsgenie.client.model.BaseRequest;
 import com.ifountain.opsgenie.client.model.ObjectWithTimeZone;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.Date;
 import java.util.TimeZone;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/GetForwardingResponse.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/GetForwardingResponse.java
index ddba153f..2446795d 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/GetForwardingResponse.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/GetForwardingResponse.java
@@ -1,8 +1,8 @@
 package com.ifountain.opsgenie.client.model.user.forward;
 
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.ifountain.opsgenie.client.model.BaseResponse;
 import com.ifountain.opsgenie.client.model.beans.Forwarding;
-import org.codehaus.jackson.annotate.JsonUnwrapped;
 
 import java.io.IOException;
 import java.text.ParseException;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/UpdateForwardingRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/UpdateForwardingRequest.java
index fd79889d..e41772ce 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/UpdateForwardingRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/model/user/forward/UpdateForwardingRequest.java
@@ -1,11 +1,11 @@
 package com.ifountain.opsgenie.client.model.user.forward;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ifountain.opsgenie.client.OpsGenieClientConstants;
 import com.ifountain.opsgenie.client.OpsGenieClientValidationException;
 import com.ifountain.opsgenie.client.model.BaseRequest;
 import com.ifountain.opsgenie.client.model.ObjectWithTimeZone;
 
-import org.codehaus.jackson.annotate.JsonProperty;
 
 import java.util.Date;
 import java.util.TimeZone;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/rest/RestApiRequest.java b/sdk/src/main/java/com/ifountain/opsgenie/client/rest/RestApiRequest.java
index 1ec583e2..de909f34 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/rest/RestApiRequest.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/rest/RestApiRequest.java
@@ -1,5 +1,7 @@
 package com.ifountain.opsgenie.client.rest;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ifountain.opsgenie.client.OpsGenieClientException;
 import com.ifountain.opsgenie.client.OpsGenieClientValidationException;
 import com.ifountain.opsgenie.client.http.OpsGenieHttpClient;
@@ -12,8 +14,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHeaders;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
+
 
 import java.io.IOException;
 import java.net.URISyntaxException;
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/rest/response/RestFailureResult.java b/sdk/src/main/java/com/ifountain/opsgenie/client/rest/response/RestFailureResult.java
index f9bf396e..6c449c50 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/rest/response/RestFailureResult.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/rest/response/RestFailureResult.java
@@ -1,8 +1,8 @@
 package com.ifountain.opsgenie.client.rest.response;
 
 
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.Map;
 
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/rest/response/RestSuccessResult.java b/sdk/src/main/java/com/ifountain/opsgenie/client/rest/response/RestSuccessResult.java
index 082af750..2892ab20 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/rest/response/RestSuccessResult.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/rest/response/RestSuccessResult.java
@@ -1,9 +1,9 @@
 package com.ifountain.opsgenie.client.rest.response;
 
 
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class RestSuccessResult<T> {
diff --git a/sdk/src/main/java/com/ifountain/opsgenie/client/util/JsonUtils.java b/sdk/src/main/java/com/ifountain/opsgenie/client/util/JsonUtils.java
index 531c4e5b..53cd0acc 100644
--- a/sdk/src/main/java/com/ifountain/opsgenie/client/util/JsonUtils.java
+++ b/sdk/src/main/java/com/ifountain/opsgenie/client/util/JsonUtils.java
@@ -1,10 +1,11 @@
 package com.ifountain.opsgenie.client.util;
 
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ifountain.opsgenie.client.OpsGenieClientConstants;
 import com.ifountain.opsgenie.client.model.ConvertFromTimeZone;
 import com.ifountain.opsgenie.client.model.ObjectWithTimeZone;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.map.ObjectMapper;
+
 
 import java.io.IOException;
 import java.text.ParseException;
diff --git a/sdk/src/test/groovy/com/ifountain/opsgenie/client/OpsGenieClientTest.groovy b/sdk/src/test/groovy/com/ifountain/opsgenie/client/OpsGenieClientTest.groovy
index 0de8fa55..03f64568 100644
--- a/sdk/src/test/groovy/com/ifountain/opsgenie/client/OpsGenieClientTest.groovy
+++ b/sdk/src/test/groovy/com/ifountain/opsgenie/client/OpsGenieClientTest.groovy
@@ -8,7 +8,6 @@ import com.ifountain.opsgenie.client.model.customer.*
 import com.ifountain.opsgenie.client.test.util.JSON
 import com.ifountain.opsgenie.client.test.util.OpsGenieClientTestCase
 import com.ifountain.opsgenie.client.util.JsonUtils
-import org.apache.commons.httpclient.util.URIUtil
 import org.apache.http.HttpHeaders
 import org.apache.http.client.methods.HttpDelete
 import org.apache.http.client.methods.HttpGet
diff --git a/test/src/main/groovy/com/ifountain/opsgenie/client/test/util/JSON.java b/test/src/main/groovy/com/ifountain/opsgenie/client/test/util/JSON.java
index efd4fa25..ca271cad 100644
--- a/test/src/main/groovy/com/ifountain/opsgenie/client/test/util/JSON.java
+++ b/test/src/main/groovy/com/ifountain/opsgenie/client/test/util/JSON.java
@@ -1,7 +1,6 @@
 package com.ifountain.opsgenie.client.test.util;
 
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.io.IOException;
 import java.util.HashMap;