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/BUCK

diff --git a/lib/BUCK b/lib/BUCK
index 8021a3d..954cb86 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,11 +1,11 @@
-# ***** This file was auto-generated at Fri, 16 Feb 2018 17:18:31 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Sun, 18 Feb 2018 17:31:29 GMT. Do not edit this file manually. *****
 # ***** Use onos-lib-gen *****
 
 pass_thru_pom(
-    name = 'onos-dependencies-pom',
-    src = 'pom.xml',
-    out = 'onos-dependencies.pom',
-    artifactId = 'onos-dependencies',
+  name = 'onos-dependencies-pom',
+  src = 'pom.xml',
+  out = 'onos-dependencies.pom',
+  artifactId = 'onos-dependencies',
 )
 
 osgi_feature_group(
@@ -1294,47 +1294,11 @@
 )
 
 remote_jar (
-  name = 'spifly-bundle',
-  out = 'org.apache.aries.spifly.dynamic.bundle-1.0.10.jar',
-  url = 'mvn:org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.0.10',
-  sha1 = '0431cb51cd15566375e8b2bab366f611c8ea4175',
-  maven_coords = 'org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.0.10',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
-  name = 'spifly-weaver',
-  out = 'org.apache.aries.spifly.weaver-internal-1.0.10.jar',
-  url = 'mvn:org.apache.aries.spifly:org.apache.aries.spifly.weaver-internal:jar:1.0.10',
-  sha1 = 'c599c8b8bf33a0ce485c4af11f1ec5e8cabf993c',
-  maven_coords = 'org.apache.aries.spifly:org.apache.aries.spifly.weaver-internal:jar:NON-OSGI:1.0.10',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
-  name = 'spifly-core',
-  out = 'org.apache.aries.spifly.core-internal-1.0.10.jar',
-  url = 'mvn:org.apache.aries.spifly:org.apache.aries.spifly.core-internal:jar:1.0.10',
-  sha1 = '63b43dbb8a0675f3236fcc3cabb161ae105992cf',
-  maven_coords = 'org.apache.aries.spifly:org.apache.aries.spifly.core-internal:jar:NON-OSGI:1.0.10',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
-  name = 'aries-util',
-  out = 'org.apache.aries.util-1.1.1.jar',
-  url = 'mvn:org.apache.aries:org.apache.aries.util:jar:1.1.1',
-  sha1 = '74f3f1c6cc23a737d5f323e05f4f3b55d8bd0eb8',
-  maven_coords = 'org.apache.aries:org.apache.aries.util:1.1.1',
-  visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
-  name = 'guava20',
-  out = 'guava-20.0.jar',
-  url = 'mvn:com.google.guava:guava:jar:20.0',
-  sha1 = '89507701249388e1ed5ddcf8c41f4ce1be7831ef',
-  maven_coords = 'com.google.guava:guava:20.0',
+  name = 'snakeyaml',
+  out = 'snakeyaml-1.15.jar',
+  url = 'mvn:org.yaml:snakeyaml:jar:1.15',
+  sha1 = '3b132bea69e8ee099f416044970997bde80f4ea6',
+  maven_coords = 'org.yaml:snakeyaml:1.15',
   visibility = [ 'PUBLIC' ],
 )
 
@@ -1598,4 +1562,3 @@
   maven_coords = 'org.apache.servicemix.bundles:org.apache.servicemix.bundles.kafka-clients:0.8.2.2_1',
   visibility = [ 'PUBLIC' ],
 )
-