홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jonathan Hart
d7bd9829 1 parent 94ffdd4b

Moved SDN-IP and config to fasterxml jackson package 

Change-Id: I5a5319188bb54738238787b58a7854e8b5564c9a
Inline Side-by-side
Showing 10 changed files with 15 additions and 21 deletions
...@@ -18,12 +18,8 @@ ...@@ -18,12 +18,8 @@
18 18
19 <dependencies> 19 <dependencies>
20 <dependency> 20 <dependency>
21 - <groupId>org.codehaus.jackson</groupId> 21 + <groupId>com.fasterxml.jackson.core</groupId>
22 - <artifactId>jackson-core-asl</artifactId> 22 + <artifactId>jackson-databind</artifactId>
23 - </dependency>
24 - <dependency>
25 - <groupId>org.codehaus.jackson</groupId>
26 - <artifactId>jackson-mapper-asl</artifactId>
27 </dependency> 23 </dependency>
28 <dependency> 24 <dependency>
29 <groupId>com.fasterxml.jackson.core</groupId> 25 <groupId>com.fasterxml.jackson.core</groupId>
......
...@@ -3,7 +3,7 @@ package org.onlab.onos.config; ...@@ -3,7 +3,7 @@ package org.onlab.onos.config;
3 import java.util.Collections; 3 import java.util.Collections;
4 import java.util.List; 4 import java.util.List;
5 5
6 -import org.codehaus.jackson.annotate.JsonProperty; 6 +import com.fasterxml.jackson.annotation.JsonProperty;
7 7
8 /** 8 /**
9 * Object to store address configuration read from a JSON file. 9 * Object to store address configuration read from a JSON file.
......
...@@ -2,7 +2,7 @@ package org.onlab.onos.config; ...@@ -2,7 +2,7 @@ package org.onlab.onos.config;
2 2
3 import java.util.List; 3 import java.util.List;
4 4
5 -import org.codehaus.jackson.annotate.JsonProperty; 5 +import com.fasterxml.jackson.annotation.JsonProperty;
6 6
7 /** 7 /**
8 * Represents a set of addresses bound to a port. 8 * Represents a set of addresses bound to a port.
......
...@@ -13,7 +13,6 @@ import org.apache.felix.scr.annotations.Component; ...@@ -13,7 +13,6 @@ import org.apache.felix.scr.annotations.Component;
13 import org.apache.felix.scr.annotations.Deactivate; 13 import org.apache.felix.scr.annotations.Deactivate;
14 import org.apache.felix.scr.annotations.Reference; 14 import org.apache.felix.scr.annotations.Reference;
15 import org.apache.felix.scr.annotations.ReferenceCardinality; 15 import org.apache.felix.scr.annotations.ReferenceCardinality;
16 -import org.codehaus.jackson.map.ObjectMapper;
17 import org.onlab.onos.net.ConnectPoint; 16 import org.onlab.onos.net.ConnectPoint;
18 import org.onlab.onos.net.DeviceId; 17 import org.onlab.onos.net.DeviceId;
19 import org.onlab.onos.net.PortNumber; 18 import org.onlab.onos.net.PortNumber;
...@@ -23,6 +22,8 @@ import org.onlab.packet.IpPrefix; ...@@ -23,6 +22,8 @@ import org.onlab.packet.IpPrefix;
23 import org.onlab.packet.MacAddress; 22 import org.onlab.packet.MacAddress;
24 import org.slf4j.Logger; 23 import org.slf4j.Logger;
25 24
25 +import com.fasterxml.jackson.databind.ObjectMapper;
26 +
26 /** 27 /**
27 * Simple configuration module to read in supplementary network configuration 28 * Simple configuration module to read in supplementary network configuration
28 * from a file. 29 * from a file.
......
...@@ -18,12 +18,8 @@ ...@@ -18,12 +18,8 @@
18 18
19 <dependencies> 19 <dependencies>
20 <dependency> 20 <dependency>
21 - <groupId>org.codehaus.jackson</groupId> 21 + <groupId>com.fasterxml.jackson.core</groupId>
22 - <artifactId>jackson-core-asl</artifactId> 22 + <artifactId>jackson-databind</artifactId>
23 - </dependency>
24 - <dependency>
25 - <groupId>org.codehaus.jackson</groupId>
26 - <artifactId>jackson-mapper-asl</artifactId>
27 </dependency> 23 </dependency>
28 <dependency> 24 <dependency>
29 <groupId>com.fasterxml.jackson.core</groupId> 25 <groupId>com.fasterxml.jackson.core</groupId>
......
...@@ -2,12 +2,12 @@ package org.onlab.onos.sdnip.config; ...@@ -2,12 +2,12 @@ package org.onlab.onos.sdnip.config;
2 2
3 import java.util.Objects; 3 import java.util.Objects;
4 4
5 -import org.codehaus.jackson.annotate.JsonProperty;
6 import org.onlab.onos.net.ConnectPoint; 5 import org.onlab.onos.net.ConnectPoint;
7 import org.onlab.onos.net.DeviceId; 6 import org.onlab.onos.net.DeviceId;
8 import org.onlab.onos.net.PortNumber; 7 import org.onlab.onos.net.PortNumber;
9 import org.onlab.packet.IpAddress; 8 import org.onlab.packet.IpAddress;
10 9
10 +import com.fasterxml.jackson.annotation.JsonProperty;
11 import com.google.common.base.MoreObjects; 11 import com.google.common.base.MoreObjects;
12 12
13 /** 13 /**
......
...@@ -3,13 +3,13 @@ package org.onlab.onos.sdnip.config; ...@@ -3,13 +3,13 @@ package org.onlab.onos.sdnip.config;
3 import java.util.List; 3 import java.util.List;
4 import java.util.Objects; 4 import java.util.Objects;
5 5
6 -import org.codehaus.jackson.annotate.JsonCreator;
7 -import org.codehaus.jackson.annotate.JsonProperty;
8 import org.onlab.onos.net.ConnectPoint; 6 import org.onlab.onos.net.ConnectPoint;
9 import org.onlab.onos.net.DeviceId; 7 import org.onlab.onos.net.DeviceId;
10 import org.onlab.onos.net.PortNumber; 8 import org.onlab.onos.net.PortNumber;
11 import org.onlab.packet.MacAddress; 9 import org.onlab.packet.MacAddress;
12 10
11 +import com.fasterxml.jackson.annotation.JsonCreator;
12 +import com.fasterxml.jackson.annotation.JsonProperty;
13 import com.google.common.base.MoreObjects; 13 import com.google.common.base.MoreObjects;
14 14
15 /** 15 /**
......
...@@ -3,7 +3,7 @@ package org.onlab.onos.sdnip.config; ...@@ -3,7 +3,7 @@ package org.onlab.onos.sdnip.config;
3 import java.util.Collections; 3 import java.util.Collections;
4 import java.util.List; 4 import java.util.List;
5 5
6 -import org.codehaus.jackson.annotate.JsonProperty; 6 +import com.fasterxml.jackson.annotation.JsonProperty;
7 7
8 /** 8 /**
9 * Contains the configuration data for SDN-IP that has been read from a 9 * Contains the configuration data for SDN-IP that has been read from a
......
...@@ -2,12 +2,12 @@ package org.onlab.onos.sdnip.config; ...@@ -2,12 +2,12 @@ package org.onlab.onos.sdnip.config;
2 2
3 import java.util.Objects; 3 import java.util.Objects;
4 4
5 -import org.codehaus.jackson.annotate.JsonProperty;
6 import org.onlab.onos.net.ConnectPoint; 5 import org.onlab.onos.net.ConnectPoint;
7 import org.onlab.onos.net.DeviceId; 6 import org.onlab.onos.net.DeviceId;
8 import org.onlab.onos.net.PortNumber; 7 import org.onlab.onos.net.PortNumber;
9 import org.onlab.packet.IpAddress; 8 import org.onlab.packet.IpAddress;
10 9
10 +import com.fasterxml.jackson.annotation.JsonProperty;
11 import com.google.common.base.MoreObjects; 11 import com.google.common.base.MoreObjects;
12 12
13 /** 13 /**
......
...@@ -6,11 +6,12 @@ import java.util.Collections; ...@@ -6,11 +6,12 @@ import java.util.Collections;
6 import java.util.Map; 6 import java.util.Map;
7 import java.util.concurrent.ConcurrentHashMap; 7 import java.util.concurrent.ConcurrentHashMap;
8 8
9 -import org.codehaus.jackson.map.ObjectMapper;
10 import org.onlab.packet.IpAddress; 9 import org.onlab.packet.IpAddress;
11 import org.slf4j.Logger; 10 import org.slf4j.Logger;
12 import org.slf4j.LoggerFactory; 11 import org.slf4j.LoggerFactory;
13 12
13 +import com.fasterxml.jackson.databind.ObjectMapper;
14 +
14 /** 15 /**
15 * SDN-IP Config Reader provides IConfigInfoService 16 * SDN-IP Config Reader provides IConfigInfoService
16 * by reading from an SDN-IP configuration file. 17 * by reading from an SDN-IP configuration file.
......