홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
d8cf5664 1 parent f22f2043

Fixed features dependencies to make sure onos-cli has jackson stuff.

Inline Side-by-side
Showing 1 changed file with 7 additions and 4 deletions
...@@ -29,18 +29,21 @@ ...@@ -29,18 +29,21 @@
29 29
30 <bundle>mvn:org.onlab.onos/onlab-nio/1.0.0-SNAPSHOT</bundle> 30 <bundle>mvn:org.onlab.onos/onlab-nio/1.0.0-SNAPSHOT</bundle>
31 31
32 + <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.4.2</bundle>
33 + <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.4.2</bundle>
34 + <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.4.2</bundle>
35 +
36 + <!-- FIXME: we should switch to use fasterxml jackson -->
32 <bundle>mvn:org.codehaus.jackson/jackson-core-asl/1.9.13</bundle> 37 <bundle>mvn:org.codehaus.jackson/jackson-core-asl/1.9.13</bundle>
33 <bundle>mvn:org.codehaus.jackson/jackson-mapper-asl/1.9.13</bundle> 38 <bundle>mvn:org.codehaus.jackson/jackson-mapper-asl/1.9.13</bundle>
39 +
34 <bundle>mvn:org.onlab.onos/onlab-thirdparty/1.0.0-SNAPSHOT</bundle> 40 <bundle>mvn:org.onlab.onos/onlab-thirdparty/1.0.0-SNAPSHOT</bundle>
35 </feature> 41 </feature>
36 42
37 <feature name="onos-thirdparty-web" version="1.0.0" 43 <feature name="onos-thirdparty-web" version="1.0.0"
38 description="ONOS 3rd party dependencies"> 44 description="ONOS 3rd party dependencies">
39 <feature>war</feature> 45 <feature>war</feature>
40 - <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.4.2</bundle> 46 + <feature>onos-thirdparty-base</feature>
41 - <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.4.2
42 - </bundle>
43 - <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.4.2</bundle>
44 <bundle>mvn:com.sun.jersey/jersey-core/1.18.1</bundle> 47 <bundle>mvn:com.sun.jersey/jersey-core/1.18.1</bundle>
45 <bundle>mvn:com.sun.jersey/jersey-server/1.18.1</bundle> 48 <bundle>mvn:com.sun.jersey/jersey-server/1.18.1</bundle>
46 <bundle>mvn:com.sun.jersey/jersey-servlet/1.18.1</bundle> 49 <bundle>mvn:com.sun.jersey/jersey-servlet/1.18.1</bundle>
......