diff --git a/themoviedbapi/pom.xml b/themoviedbapi/pom.xml
index b98ef871c..90577519b 100644
--- a/themoviedbapi/pom.xml
+++ b/themoviedbapi/pom.xml
@@ -40,37 +40,50 @@
     </properties>
 
     <dependencies>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.10</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>1.2.17</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-core-lgpl</artifactId>
-            <version>1.9.10</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.1.0</version>
         </dependency>
+
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-lgpl</artifactId>
-            <version>1.9.10</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.1.0</version>
         </dependency>
+
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
             <version>1.7</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <version>3.1</version>
         </dependency>
+
     </dependencies>
 
     <profiles>
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java
index b4a9903fa..488db554a 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java
@@ -12,6 +12,7 @@
  */
 package com.moviejukebox.themoviedb;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.moviejukebox.themoviedb.MovieDbException.MovieDbExceptionType;
 import com.moviejukebox.themoviedb.model.*;
 import com.moviejukebox.themoviedb.tools.ApiUrl;
@@ -26,7 +27,6 @@ import java.util.ArrayList;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.map.ObjectMapper;
 
 /**
  * The MovieDb API
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/AlternativeTitle.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/AlternativeTitle.java
index 5a47b033b..420ec6160 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/AlternativeTitle.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/AlternativeTitle.java
@@ -12,10 +12,10 @@
  */
 package com.moviejukebox.themoviedb.model;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Artwork.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Artwork.java
index cb1a67edd..ee94787ce 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Artwork.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Artwork.java
@@ -12,10 +12,10 @@
  */
 package com.moviejukebox.themoviedb.model;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  * The artwork type information
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Collection.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Collection.java
index cb52c61d0..be77b9d6a 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Collection.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Collection.java
@@ -12,12 +12,12 @@
  */
 package com.moviejukebox.themoviedb.model;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 import java.io.Serializable;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/CollectionInfo.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/CollectionInfo.java
index 065000d9b..a49ea08fa 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/CollectionInfo.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/CollectionInfo.java
@@ -12,12 +12,12 @@
  */
 package com.moviejukebox.themoviedb.model;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Company.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Company.java
index 8e3a6e592..539e3a387 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Company.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Company.java
@@ -12,10 +12,10 @@
  */
 package com.moviejukebox.themoviedb.model;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  * Company information
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Genre.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Genre.java
index 05134b615..1aeb44730 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Genre.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Genre.java
@@ -12,11 +12,11 @@
  */
 package com.moviejukebox.themoviedb.model;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 import java.io.Serializable;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Keyword.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Keyword.java
index d1ed3fb06..0f5b72f75 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Keyword.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Keyword.java
@@ -12,11 +12,11 @@
  */
 package com.moviejukebox.themoviedb.model;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 import java.io.Serializable;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Language.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Language.java
index ef1caeb64..d05ded99e 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Language.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Language.java
@@ -12,11 +12,11 @@
  */
 package com.moviejukebox.themoviedb.model;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 import java.io.Serializable;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/MovieDb.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/MovieDb.java
index 23beddb79..15a4c8d99 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/MovieDb.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/MovieDb.java
@@ -12,11 +12,11 @@
  */
 package com.moviejukebox.themoviedb.model;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
 import java.util.List;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  * Movie Bean
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Person.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Person.java
index ce0a11ac6..f38c3b260 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Person.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Person.java
@@ -12,12 +12,12 @@
  */
 package com.moviejukebox.themoviedb.model;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCast.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCast.java
index de25decaf..5a13b3889 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCast.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCast.java
@@ -12,10 +12,10 @@
  */
 package com.moviejukebox.themoviedb.model;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  *
@@ -96,7 +96,7 @@ public class PersonCast implements Serializable {
     public void setCastId(int castId) {
         this.castId = castId;
     }
-    
+
     //</editor-fold>
 
     /**
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCredit.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCredit.java
index e622db30a..e4060445f 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCredit.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCredit.java
@@ -12,10 +12,10 @@
  */
 package com.moviejukebox.themoviedb.model;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCrew.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCrew.java
index 86aa54c8d..d7f545951 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCrew.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCrew.java
@@ -12,10 +12,10 @@
  */
 package com.moviejukebox.themoviedb.model;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ProductionCompany.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ProductionCompany.java
index cd3be8618..33785f817 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ProductionCompany.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ProductionCompany.java
@@ -12,11 +12,11 @@
  */
 package com.moviejukebox.themoviedb.model;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 import java.io.Serializable;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ProductionCountry.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ProductionCountry.java
index fb389e5a4..f435c6cc7 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ProductionCountry.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ProductionCountry.java
@@ -12,11 +12,11 @@
  */
 package com.moviejukebox.themoviedb.model;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 import java.io.Serializable;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ReleaseInfo.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ReleaseInfo.java
index aee789515..b6b040049 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ReleaseInfo.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ReleaseInfo.java
@@ -12,10 +12,10 @@
  */
 package com.moviejukebox.themoviedb.model;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/StatusCode.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/StatusCode.java
index 71112bbfa..9452b3ff8 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/StatusCode.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/StatusCode.java
@@ -12,10 +12,10 @@
  */
 package com.moviejukebox.themoviedb.model;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java
index cea898a49..ff45215b5 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java
@@ -12,12 +12,12 @@
  */
 package com.moviejukebox.themoviedb.model;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TokenAuthorisation.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TokenAuthorisation.java
index 8407b811c..579cc0ce5 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TokenAuthorisation.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TokenAuthorisation.java
@@ -12,9 +12,9 @@
  */
 package com.moviejukebox.themoviedb.model;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 public class TokenAuthorisation {
     /*
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TokenSession.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TokenSession.java
index d3542ec30..f20d3c043 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TokenSession.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TokenSession.java
@@ -12,9 +12,9 @@
  */
 package com.moviejukebox.themoviedb.model;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 public class TokenSession {
     /*
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Trailer.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Trailer.java
index 91967612f..009693e08 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Trailer.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Trailer.java
@@ -12,9 +12,9 @@
  */
 package com.moviejukebox.themoviedb.model;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.io.Serializable;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Translation.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Translation.java
index d3b5dcf5b..ec76728a6 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Translation.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Translation.java
@@ -12,10 +12,10 @@
  */
 package com.moviejukebox.themoviedb.model;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperAlternativeTitles.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperAlternativeTitles.java
index a0fce3344..869615093 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperAlternativeTitles.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperAlternativeTitles.java
@@ -12,11 +12,11 @@
  */
 package com.moviejukebox.themoviedb.wrapper;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.moviejukebox.themoviedb.model.AlternativeTitle;
 import java.util.List;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompany.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompany.java
index 668a02056..8065b8965 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompany.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompany.java
@@ -12,11 +12,11 @@
  */
 package com.moviejukebox.themoviedb.wrapper;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.moviejukebox.themoviedb.model.Company;
 import java.util.List;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompanyMovies.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompanyMovies.java
index 215ce051f..467c9980c 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompanyMovies.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompanyMovies.java
@@ -12,11 +12,11 @@
  */
 package com.moviejukebox.themoviedb.wrapper;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.moviejukebox.themoviedb.model.MovieDb;
 import java.util.List;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperConfig.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperConfig.java
index 20836c988..01d12a795 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperConfig.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperConfig.java
@@ -12,10 +12,10 @@
  */
 package com.moviejukebox.themoviedb.wrapper;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.moviejukebox.themoviedb.model.TmdbConfiguration;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  *
@@ -40,7 +40,7 @@ public class WrapperConfig {
     public void setTmdbConfiguration(TmdbConfiguration tmdbConfiguration) {
         this.tmdbConfiguration = tmdbConfiguration;
     }
-    
+
     /**
      * Handle unknown properties and print a message
      * @param key
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperGenres.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperGenres.java
index ce263ee09..986a1adfa 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperGenres.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperGenres.java
@@ -12,11 +12,11 @@
  */
 package com.moviejukebox.themoviedb.wrapper;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.moviejukebox.themoviedb.model.Genre;
 import java.util.List;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  * Wrapper class for the Genres searches
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperImages.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperImages.java
index 3ff66174b..cdbe36cf2 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperImages.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperImages.java
@@ -12,11 +12,11 @@
  */
 package com.moviejukebox.themoviedb.wrapper;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.moviejukebox.themoviedb.model.Artwork;
 import java.util.List;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovie.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovie.java
index 24a2dd74a..40ff5fbf1 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovie.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovie.java
@@ -12,11 +12,11 @@
  */
 package com.moviejukebox.themoviedb.wrapper;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.moviejukebox.themoviedb.model.MovieDb;
 import java.util.List;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieCasts.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieCasts.java
index 337050bc7..c327dfc8b 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieCasts.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieCasts.java
@@ -12,12 +12,12 @@
  */
 package com.moviejukebox.themoviedb.wrapper;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.moviejukebox.themoviedb.model.PersonCast;
 import com.moviejukebox.themoviedb.model.PersonCrew;
 import java.util.List;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieKeywords.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieKeywords.java
index 3b7ca0898..182bdce2c 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieKeywords.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieKeywords.java
@@ -12,11 +12,11 @@
  */
 package com.moviejukebox.themoviedb.wrapper;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.moviejukebox.themoviedb.model.Keyword;
 import java.util.List;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPerson.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPerson.java
index 474ff404d..a20adc6e8 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPerson.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPerson.java
@@ -12,11 +12,11 @@
  */
 package com.moviejukebox.themoviedb.wrapper;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.moviejukebox.themoviedb.model.Person;
 import java.util.List;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPersonCredits.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPersonCredits.java
index 78e4169d9..c2a612030 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPersonCredits.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPersonCredits.java
@@ -12,11 +12,11 @@
  */
 package com.moviejukebox.themoviedb.wrapper;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.moviejukebox.themoviedb.model.PersonCredit;
 import java.util.List;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperReleaseInfo.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperReleaseInfo.java
index 247228399..8e9621f39 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperReleaseInfo.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperReleaseInfo.java
@@ -12,11 +12,11 @@
  */
 package com.moviejukebox.themoviedb.wrapper;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.moviejukebox.themoviedb.model.ReleaseInfo;
 import java.util.List;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTrailers.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTrailers.java
index de8fabd17..3b746bbff 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTrailers.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTrailers.java
@@ -12,11 +12,11 @@
  */
 package com.moviejukebox.themoviedb.wrapper;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.moviejukebox.themoviedb.model.Trailer;
 import java.util.List;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 /**
  *
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTranslations.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTranslations.java
index c0e3417e6..6a4e8d560 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTranslations.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTranslations.java
@@ -12,10 +12,10 @@
  */
 package com.moviejukebox.themoviedb.wrapper;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.moviejukebox.themoviedb.model.Translation;
 import java.util.List;
 import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonAnySetter;
 
 /**
  *