Upgrade Jackson to 2.5.0

carlossg · carlossg · commit ca393e719419 · 2015-02-11T11:05:36.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -44,6 +44,7 @@
 	    <kubernetes.api.password>vagrant</kubernetes.api.password>
 	    <docker.image>busybox</docker.image>
 	    <resteasy.version>3.0.9.Final</resteasy.version>
+	    <jackson.version>2.5.0</jackson.version>
   	</properties>
 
 	<dependencies>
@@ -52,11 +53,6 @@
 			<artifactId>jaxrs-api</artifactId>
 			<version>${resteasy.version}</version>
 		</dependency>
- 		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-core-asl</artifactId>
-			<version>1.9.12</version>
-		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
@@ -80,19 +76,9 @@
 			<version>${resteasy.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.jboss.resteasy</groupId>
-			<artifactId>resteasy-jaxrs</artifactId>
-			<version>${resteasy.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.resteasy</groupId>
-			<artifactId>resteasy-jaxb-provider</artifactId>
-			<version>${resteasy.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.resteasy</groupId>
-			<artifactId>resteasy-jackson-provider</artifactId>
-			<version>${resteasy.version}</version>
+			<groupId>com.fasterxml.jackson.jaxrs</groupId>
+			<artifactId>jackson-jaxrs-json-provider</artifactId>
+			<version>${jackson.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/src/main/java/com/github/kubernetes/java/client/model/Container.java b/src/main/java/com/github/kubernetes/java/client/model/Container.java
@@ -25,8 +25,9 @@
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonProperty;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Container {
 
diff --git a/src/main/java/com/github/kubernetes/java/client/model/Kind.java b/src/main/java/com/github/kubernetes/java/client/model/Kind.java
@@ -1,7 +1,7 @@
 package com.github.kubernetes.java.client.model;
 
-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 enum Kind {
     STATUS("Status"), STATUSDETAILS("StatusDetails"), POD("Pod"), PODLIST("PodList"), REPLICATIONCONTROLLER(
diff --git a/src/main/java/com/github/kubernetes/java/client/v2/RestFactory.java b/src/main/java/com/github/kubernetes/java/client/v2/RestFactory.java
@@ -12,12 +12,13 @@
 import org.apache.http.impl.client.BasicAuthCache;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.protocol.BasicHttpContext;
-import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider;
 import org.jboss.resteasy.client.jaxrs.ProxyBuilder;
 import org.jboss.resteasy.client.jaxrs.ResteasyClient;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
 import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient4Engine;
 
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
+
 public class RestFactory {
 
     private final ClassLoader classLoader;
