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

apps/openstacknetworking/BUCK

diff --git a/apps/openstacknetworking/BUCK b/apps/openstacknetworking/BUCK
index c096724..d1e59f3 100644
--- a/apps/openstacknetworking/BUCK
+++ b/apps/openstacknetworking/BUCK
@@ -15,6 +15,7 @@
     '//lib:jackson-coreutils',
     '//lib:btf',
     '//lib:msg-simple',
+    '//lib:snakeyaml',
 ]
 
 TEST_DEPS = [
@@ -29,19 +30,22 @@
     '//apps/openstacknetworking:onos-apps-openstacknetworking',
 ]
 
-EXCLUDED_BUNDLES = [
-    '//lib:openstack4j-core',
-    '//lib:openstack4j-http-connector',
-    '//lib:openstack4j-httpclient',
-    '//lib:json-patch',
-    '//lib:jackson-coreutils',
-    '//lib:btf',
-    '//lib:msg-simple',
-    '//lib:spifly-bundle',
-    '//lib:spifly-weaver',
-    '//lib:spifly-core',
-    '//lib:aries-util',
-]
+RESOURCES = {
+    'openstack4j-core-3.1.0.jar': 'src/main/resources/deps/openstack4j-core-3.1.0.jar',
+    'openstack4j-http-connector-3.1.0.jar': 'src/main/resources/deps/openstack4j-http-connector-3.1.0.jar',
+    'openstack4j-httpclient-3.1.0.jar': 'src/main/resources/deps/openstack4j-httpclient-3.1.0.jar',
+    'json-patch-1.9.jar': 'src/main/resources/deps/json-patch-1.9.jar',
+    'jackson-coreutils-1.6.jar': 'src/main/resources/deps/jackson-coreutils-1.6.jar',
+    'msg-simple-1.1.jar': 'src/main/resources/deps/msg-simple-1.1.jar',
+    'btf-1.2.jar': 'src/main/resources/deps/btf-1.2.jar',
+    'snakeyaml-1.15.jar': 'src/main/resources/deps/snakeyaml-1.15.jar',
+}
+
+OPENSTACK4J_LIB = 'openstack4j-core-3.1.0.jar,openstack4j-http-connector-3.1.0.jar,openstack4j-httpclient-3.1.0.jar'
+JACKSON_LIB = 'json-patch-1.9.jar,jackson-coreutils-1.6.jar,msg-simple-1.1.jar,btf-1.2.jar,snakeyaml-1.15.jar'
+
+INCLUDE_PACKAGES = 'com.google.common.net,com.google.common.io,com.fasterxml.jackson.annotation,*'
+EXCLUDE_PACKAGES = '!org.openstack4j,!org.openstack4j.*'
 
 osgi_jar_with_tests (
     deps = COMPILE_DEPS,
@@ -51,6 +55,11 @@
     api_version = '1.0',
     api_description = 'REST API for OpenStack Networking',
     api_package = 'org.onosproject.openstacknetworking.web',
+
+    # dependency embedding
+    include_resources = RESOURCES,
+    import_packages = INCLUDE_PACKAGES + ',' + EXCLUDE_PACKAGES,
+    bundle_classpath = OPENSTACK4J_LIB + ',' + JACKSON_LIB
 )
 
 onos_app (
@@ -59,9 +68,8 @@
     category = 'Utility',
     url = 'http://onosproject.org',
     included_bundles = BUNDLES,
-    excluded_bundles = EXCLUDED_BUNDLES,
     description = 'OpenStack Networking application.',
     required_apps = [
         'org.onosproject.openstacknode'
     ]
-)
+)
\ No newline at end of file