commit 54c46048e9dab41e7a973b1036c14a44b616f2fd
author Jian Li <pyguni@gmail.com> Tue Feb 20 00:32:01 2018 +0900
committer Ray Milkey <ray@opennetworking.org> Fri Feb 23 00:30:28 2018 +0000
tree a8ad7c8bd20b31414dbcb435c1be94450a9feb45
parent 6249486960ca1baf6ded2757241ed42dd529008a

Fix: resolve SONA activation issue due to deps conflict in BUCK

Change-Id: I1f2b326562c4ce5c6534792d144e73059016a0a5

lib/deps.json

diff --git a/lib/deps.json b/lib/deps.json
index ede7521..57bc0c5 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -233,6 +233,7 @@
     "bti7000": "mvn:org.onosproject:mibbler-mibs-bti7000:1.0-20151221.1",
     "mibs-net-snmp": "mvn:org.onosproject:mibbler-mibs-net-snmp:1.0-20151221.1",
     "mibs-rfc": "mvn:org.onosproject:mibbler-mibs-rfc:1.0-20151221.1",
+
     // Openstack4j related jars
     "openstack4j-core": "mvn:org.pacesys:openstack4j-core:3.1.0",
     "openstack4j-http-connector": "mvn:org.pacesys.openstack4j.connectors:openstack4j-http-connector:3.1.0",
@@ -241,11 +242,7 @@
     "jackson-coreutils": "mvn:com.github.fge:jackson-coreutils:1.6",
     "btf": "mvn:com.github.fge:btf:1.2",
     "msg-simple": "mvn:com.github.fge:msg-simple:1.1",
-    "spifly-bundle": "mvn:org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.0.10",
-    "spifly-weaver": "mvn:org.apache.aries.spifly:org.apache.aries.spifly.weaver-internal:1.0.10",
-    "spifly-core": "mvn:org.apache.aries.spifly:org.apache.aries.spifly.core-internal:1.0.10",
-    "aries-util": "mvn:org.apache.aries:org.apache.aries.util:1.1.1",
-    "guava20": "mvn:com.google.guava:guava:20.0",
+    "snakeyaml": "mvn:org.yaml:snakeyaml:1.15",
 
     // Note update BVER in tools/dev/bin/patch-yang-libs and YANG_VER in tools/build/onos-buck
     "onos-yang-model":"mvn:org.onosproject:onos-yang-model:2.4.1",