홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jian Li
Committed by Gerrit Code Review
a5a312b3 1 parent 489aa9ba

Replace stale codehaus jackson lib to new fasterxml jackson lib 

Change-Id: I80c8d3dcbcae438c07c07957c980375de71180c3
Inline Side-by-side
Showing 6 changed files with 31 additions and 38 deletions
...@@ -46,14 +46,6 @@ ...@@ -46,14 +46,6 @@
46 <artifactId>org.apache.karaf.shell.console</artifactId> 46 <artifactId>org.apache.karaf.shell.console</artifactId>
47 </dependency> 47 </dependency>
48 <dependency> 48 <dependency>
49 - <groupId>org.codehaus.jackson</groupId>
50 - <artifactId>jackson-core-asl</artifactId>
51 - </dependency>
52 - <dependency>
53 - <groupId>org.codehaus.jackson</groupId>
54 - <artifactId>jackson-mapper-asl</artifactId>
55 - </dependency>
56 - <dependency>
57 <groupId>com.fasterxml.jackson.core</groupId> 49 <groupId>com.fasterxml.jackson.core</groupId>
58 <artifactId>jackson-annotations</artifactId> 50 <artifactId>jackson-annotations</artifactId>
59 <scope>provided</scope> 51 <scope>provided</scope>
...@@ -63,6 +55,21 @@ ...@@ -63,6 +55,21 @@
63 <artifactId>onos-core-serializers</artifactId> 55 <artifactId>onos-core-serializers</artifactId>
64 <version>${project.version}</version> 56 <version>${project.version}</version>
65 </dependency> 57 </dependency>
58 + <dependency>
59 + <groupId>com.fasterxml.jackson.core</groupId>
60 + <artifactId>jackson-databind</artifactId>
61 + <version>2.4.2</version>
62 + </dependency>
63 + <dependency>
64 + <groupId>com.fasterxml.jackson.core</groupId>
65 + <artifactId>jackson-annotations</artifactId>
66 + <version>2.4.2</version>
67 + </dependency>
68 + <dependency>
69 + <groupId>com.fasterxml.jackson.core</groupId>
70 + <artifactId>jackson-databind</artifactId>
71 + <version>2.6.4</version>
72 + </dependency>
66 73
67 </dependencies> 74 </dependencies>
68 75
......
...@@ -15,11 +15,12 @@ ...@@ -15,11 +15,12 @@
15 */ 15 */
16 package org.onosproject.optical.cfg; 16 package org.onosproject.optical.cfg;
17 17
18 -import org.codehaus.jackson.JsonNode; 18 +import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
19 -import org.codehaus.jackson.JsonParseException; 19 +import com.fasterxml.jackson.core.JsonParseException;
20 -import org.codehaus.jackson.annotate.JsonIgnoreProperties; 20 +import com.fasterxml.jackson.databind.JsonMappingException;
21 -import org.codehaus.jackson.map.JsonMappingException; 21 +import com.fasterxml.jackson.databind.JsonNode;
22 -import org.codehaus.jackson.map.ObjectMapper; 22 +import com.fasterxml.jackson.databind.ObjectMapper;
23 +import org.onlab.packet.ChassisId;
23 import org.onosproject.net.ConnectPoint; 24 import org.onosproject.net.ConnectPoint;
24 import org.onosproject.net.DefaultAnnotations; 25 import org.onosproject.net.DefaultAnnotations;
25 import org.onosproject.net.Device; 26 import org.onosproject.net.Device;
...@@ -38,7 +39,6 @@ import org.onosproject.net.link.LinkProviderRegistry; ...@@ -38,7 +39,6 @@ import org.onosproject.net.link.LinkProviderRegistry;
38 import org.onosproject.net.link.LinkProviderService; 39 import org.onosproject.net.link.LinkProviderService;
39 import org.onosproject.net.provider.AbstractProvider; 40 import org.onosproject.net.provider.AbstractProvider;
40 import org.onosproject.net.provider.ProviderId; 41 import org.onosproject.net.provider.ProviderId;
41 -import org.onlab.packet.ChassisId;
42 import org.slf4j.Logger; 42 import org.slf4j.Logger;
43 import org.slf4j.LoggerFactory; 43 import org.slf4j.LoggerFactory;
44 44
......
...@@ -15,10 +15,11 @@ ...@@ -15,10 +15,11 @@
15 */ 15 */
16 package org.onosproject.optical.cfg; 16 package org.onosproject.optical.cfg;
17 17
18 -import java.util.Map; 18 +import com.fasterxml.jackson.databind.JsonNode;
19 -import org.codehaus.jackson.JsonNode;
20 import org.onlab.util.HexString; 19 import org.onlab.util.HexString;
21 20
21 +import java.util.Map;
22 +
22 /** 23 /**
23 * Public class corresponding to JSON described data model. 24 * Public class corresponding to JSON described data model.
24 * 25 *
......
...@@ -15,11 +15,12 @@ ...@@ -15,11 +15,12 @@
15 */ 15 */
16 package org.onosproject.optical.cfg; 16 package org.onosproject.optical.cfg;
17 17
18 -import java.util.Map; 18 +import com.fasterxml.jackson.annotation.JsonProperty;
19 -import org.codehaus.jackson.JsonNode; 19 +import com.fasterxml.jackson.databind.JsonNode;
20 -import org.codehaus.jackson.annotate.JsonProperty;
21 import org.onlab.util.HexString; 20 import org.onlab.util.HexString;
22 21
22 +import java.util.Map;
23 +
23 /** 24 /**
24 * Public class corresponding to JSON described data model. 25 * Public class corresponding to JSON described data model.
25 * 26 *
......
...@@ -55,10 +55,6 @@ ...@@ -55,10 +55,6 @@
55 <bundle>mvn:commons-configuration/commons-configuration/1.10</bundle> 55 <bundle>mvn:commons-configuration/commons-configuration/1.10</bundle>
56 <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle> 56 <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
57 57
58 - <!-- FIXME: we should switch to use fasterxml jackson -->
59 - <bundle>mvn:org.codehaus.jackson/jackson-core-asl/1.9.13</bundle>
60 - <bundle>mvn:org.codehaus.jackson/jackson-mapper-asl/1.9.13</bundle>
61 -
62 <bundle>mvn:com.typesafe/config/1.2.1</bundle> 58 <bundle>mvn:com.typesafe/config/1.2.1</bundle>
63 <bundle>mvn:org.onosproject/onlab-thirdparty/@ONOS-VERSION</bundle> 59 <bundle>mvn:org.onosproject/onlab-thirdparty/@ONOS-VERSION</bundle>
64 60
......
...@@ -85,8 +85,7 @@ ...@@ -85,8 +85,7 @@
85 <osgi.version>4.3.1</osgi.version> 85 <osgi.version>4.3.1</osgi.version>
86 <karaf.version>3.0.3</karaf.version> 86 <karaf.version>3.0.3</karaf.version>
87 <jersey.version>1.19</jersey.version> 87 <jersey.version>1.19</jersey.version>
88 - <fasterxml.jackson.version>2.6.4</fasterxml.jackson.version> 88 + <jackson.version>2.6.4</jackson.version>
89 - <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
90 <slf4j.version>1.7.6</slf4j.version> 89 <slf4j.version>1.7.6</slf4j.version>
91 <guava.version>19.0</guava.version> 90 <guava.version>19.0</guava.version>
92 <commons.io.version>2.4</commons.io.version> 91 <commons.io.version>2.4</commons.io.version>
...@@ -196,17 +195,6 @@ ...@@ -196,17 +195,6 @@
196 </dependency> 195 </dependency>
197 196
198 <dependency> 197 <dependency>
199 - <groupId>org.codehaus.jackson</groupId>
200 - <artifactId>jackson-core-asl</artifactId>
201 - <version>${codehaus.jackson.version}</version>
202 - </dependency>
203 - <dependency>
204 - <groupId>org.codehaus.jackson</groupId>
205 - <artifactId>jackson-mapper-asl</artifactId>
206 - <version>${codehaus.jackson.version}</version>
207 - </dependency>
208 -
209 - <dependency>
210 <groupId>org.easymock</groupId> 198 <groupId>org.easymock</groupId>
211 <artifactId>easymock</artifactId> 199 <artifactId>easymock</artifactId>
212 <version>3.4</version> 200 <version>3.4</version>
...@@ -246,13 +234,13 @@ ...@@ -246,13 +234,13 @@
246 <dependency> 234 <dependency>
247 <groupId>com.fasterxml.jackson.core</groupId> 235 <groupId>com.fasterxml.jackson.core</groupId>
248 <artifactId>jackson-databind</artifactId> 236 <artifactId>jackson-databind</artifactId>
249 - <version>${fasterxml.jackson.version}</version> 237 + <version>${jackson.version}</version>
250 <scope>provided</scope> 238 <scope>provided</scope>
251 </dependency> 239 </dependency>
252 <dependency> 240 <dependency>
253 <groupId>com.fasterxml.jackson.core</groupId> 241 <groupId>com.fasterxml.jackson.core</groupId>
254 <artifactId>jackson-annotations</artifactId> 242 <artifactId>jackson-annotations</artifactId>
255 - <version>${fasterxml.jackson.version}</version> 243 + <version>${jackson.version}</version>
256 <scope>provided</scope> 244 <scope>provided</scope>
257 </dependency> 245 </dependency>
258 246
......