| commit | d7bd98290c23cebd627862ed68107889fd82724f | [log] [tgz] |
|---|---|---|
| author | Jonathan Hart <jono@onlab.us> | Mon Oct 20 18:18:02 2014 -0700 |
| committer | Jonathan Hart <jono@onlab.us> | Mon Oct 20 18:26:13 2014 -0700 |
| tree | bdfeec220568ce3d2aacfa34c9813c7e914c7fec | |
| parent | 94ffdd4b2adaff8c325318a7a17f081c73575ba8 [diff] |
Moved SDN-IP and config to fasterxml jackson package Change-Id: I5a5319188bb54738238787b58a7854e8b5564c9a
diff --git a/apps/config/src/main/java/org/onlab/onos/config/AddressConfiguration.java b/apps/config/src/main/java/org/onlab/onos/config/AddressConfiguration.java index 580e950..43b7d34 100644 --- a/apps/config/src/main/java/org/onlab/onos/config/AddressConfiguration.java +++ b/apps/config/src/main/java/org/onlab/onos/config/AddressConfiguration.java
@@ -3,7 +3,7 @@ import java.util.Collections; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; /** * Object to store address configuration read from a JSON file.
diff --git a/apps/config/src/main/java/org/onlab/onos/config/AddressEntry.java b/apps/config/src/main/java/org/onlab/onos/config/AddressEntry.java index 081efed..bc1b168 100644 --- a/apps/config/src/main/java/org/onlab/onos/config/AddressEntry.java +++ b/apps/config/src/main/java/org/onlab/onos/config/AddressEntry.java
@@ -2,7 +2,7 @@ import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; /** * Represents a set of addresses bound to a port.
diff --git a/apps/config/src/main/java/org/onlab/onos/config/NetworkConfigReader.java b/apps/config/src/main/java/org/onlab/onos/config/NetworkConfigReader.java index 4f1a48a..3c090cf 100644 --- a/apps/config/src/main/java/org/onlab/onos/config/NetworkConfigReader.java +++ b/apps/config/src/main/java/org/onlab/onos/config/NetworkConfigReader.java
@@ -13,7 +13,6 @@ import org.apache.felix.scr.annotations.Deactivate; import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.ReferenceCardinality; -import org.codehaus.jackson.map.ObjectMapper; import org.onlab.onos.net.ConnectPoint; import org.onlab.onos.net.DeviceId; import org.onlab.onos.net.PortNumber; @@ -23,6 +22,8 @@ import org.onlab.packet.MacAddress; import org.slf4j.Logger; +import com.fasterxml.jackson.databind.ObjectMapper; + /** * Simple configuration module to read in supplementary network configuration * from a file.