Replace stale codehaus jackson lib to new fasterxml jackson lib
Change-Id: I80c8d3dcbcae438c07c07957c980375de71180c3
diff --git a/apps/optical/pom.xml b/apps/optical/pom.xml
index 86f6cc0..4e001c7 100644
--- a/apps/optical/pom.xml
+++ b/apps/optical/pom.xml
@@ -46,14 +46,6 @@
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </dependency>
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<scope>provided</scope>
@@ -63,6 +55,21 @@
<artifactId>onos-core-serializers</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>2.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.6.4</version>
+ </dependency>
</dependencies>
diff --git a/apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalConfigProvider.java b/apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalConfigProvider.java
index dbe0b54..31dbe0e 100644
--- a/apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalConfigProvider.java
+++ b/apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalConfigProvider.java
@@ -15,11 +15,12 @@
*/
package org.onosproject.optical.cfg;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.onlab.packet.ChassisId;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DefaultAnnotations;
import org.onosproject.net.Device;
@@ -38,7 +39,6 @@
import org.onosproject.net.link.LinkProviderService;
import org.onosproject.net.provider.AbstractProvider;
import org.onosproject.net.provider.ProviderId;
-import org.onlab.packet.ChassisId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalLinkDescription.java b/apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalLinkDescription.java
index 1673335..2da1679 100644
--- a/apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalLinkDescription.java
+++ b/apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalLinkDescription.java
@@ -15,10 +15,11 @@
*/
package org.onosproject.optical.cfg;
-import java.util.Map;
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.databind.JsonNode;
import org.onlab.util.HexString;
+import java.util.Map;
+
/**
* Public class corresponding to JSON described data model.
*
diff --git a/apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalSwitchDescription.java b/apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalSwitchDescription.java
index 346088f..531034a 100644
--- a/apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalSwitchDescription.java
+++ b/apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalSwitchDescription.java
@@ -15,11 +15,12 @@
*/
package org.onosproject.optical.cfg;
-import java.util.Map;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.JsonNode;
import org.onlab.util.HexString;
+import java.util.Map;
+
/**
* Public class corresponding to JSON described data model.
*
diff --git a/features/features.xml b/features/features.xml
index 75a75d6..eb3bba9 100644
--- a/features/features.xml
+++ b/features/features.xml
@@ -55,10 +55,6 @@
<bundle>mvn:commons-configuration/commons-configuration/1.10</bundle>
<bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
- <!-- FIXME: we should switch to use fasterxml jackson -->
- <bundle>mvn:org.codehaus.jackson/jackson-core-asl/1.9.13</bundle>
- <bundle>mvn:org.codehaus.jackson/jackson-mapper-asl/1.9.13</bundle>
-
<bundle>mvn:com.typesafe/config/1.2.1</bundle>
<bundle>mvn:org.onosproject/onlab-thirdparty/@ONOS-VERSION</bundle>
diff --git a/pom.xml b/pom.xml
index 5707379..941c353 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,8 +85,7 @@
<osgi.version>4.3.1</osgi.version>
<karaf.version>3.0.3</karaf.version>
<jersey.version>1.19</jersey.version>
- <fasterxml.jackson.version>2.6.4</fasterxml.jackson.version>
- <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
+ <jackson.version>2.6.4</jackson.version>
<slf4j.version>1.7.6</slf4j.version>
<guava.version>19.0</guava.version>
<commons.io.version>2.4</commons.io.version>
@@ -196,17 +195,6 @@
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>${codehaus.jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>${codehaus.jackson.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>3.4</version>
@@ -246,13 +234,13 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${fasterxml.jackson.version}</version>
+ <version>${jackson.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>${fasterxml.jackson.version}</version>
+ <version>${jackson.version}</version>
<scope>provided</scope>
</dependency>