Fix: resolve SONA activation issue due to deps conflict in BUCK
Change-Id: I1f2b326562c4ce5c6534792d144e73059016a0a5
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
diff --git a/apps/openstacknetworking/src/main/resources/deps/btf-1.2.jar b/apps/openstacknetworking/src/main/resources/deps/btf-1.2.jar
new file mode 100644
index 0000000..bbeee88
--- /dev/null
+++ b/apps/openstacknetworking/src/main/resources/deps/btf-1.2.jar
Binary files differ
diff --git a/apps/openstacknetworking/src/main/resources/deps/jackson-coreutils-1.6.jar b/apps/openstacknetworking/src/main/resources/deps/jackson-coreutils-1.6.jar
new file mode 100644
index 0000000..ee7b43d
--- /dev/null
+++ b/apps/openstacknetworking/src/main/resources/deps/jackson-coreutils-1.6.jar
Binary files differ
diff --git a/apps/openstacknetworking/src/main/resources/deps/json-patch-1.9.jar b/apps/openstacknetworking/src/main/resources/deps/json-patch-1.9.jar
new file mode 100644
index 0000000..36569b6
--- /dev/null
+++ b/apps/openstacknetworking/src/main/resources/deps/json-patch-1.9.jar
Binary files differ
diff --git a/apps/openstacknetworking/src/main/resources/deps/msg-simple-1.1.jar b/apps/openstacknetworking/src/main/resources/deps/msg-simple-1.1.jar
new file mode 100644
index 0000000..db74210
--- /dev/null
+++ b/apps/openstacknetworking/src/main/resources/deps/msg-simple-1.1.jar
Binary files differ
diff --git a/apps/openstacknetworking/src/main/resources/deps/openstack4j-core-3.1.0.jar b/apps/openstacknetworking/src/main/resources/deps/openstack4j-core-3.1.0.jar
new file mode 100644
index 0000000..c03203f
--- /dev/null
+++ b/apps/openstacknetworking/src/main/resources/deps/openstack4j-core-3.1.0.jar
Binary files differ
diff --git a/apps/openstacknetworking/src/main/resources/deps/openstack4j-http-connector-3.1.0.jar b/apps/openstacknetworking/src/main/resources/deps/openstack4j-http-connector-3.1.0.jar
new file mode 100644
index 0000000..cbe8476
--- /dev/null
+++ b/apps/openstacknetworking/src/main/resources/deps/openstack4j-http-connector-3.1.0.jar
Binary files differ
diff --git a/apps/openstacknetworking/src/main/resources/deps/openstack4j-httpclient-3.1.0.jar b/apps/openstacknetworking/src/main/resources/deps/openstack4j-httpclient-3.1.0.jar
new file mode 100644
index 0000000..964b15a
--- /dev/null
+++ b/apps/openstacknetworking/src/main/resources/deps/openstack4j-httpclient-3.1.0.jar
Binary files differ
diff --git a/apps/openstacknetworking/src/main/resources/deps/snakeyaml-1.15.jar b/apps/openstacknetworking/src/main/resources/deps/snakeyaml-1.15.jar
new file mode 100644
index 0000000..34084e3
--- /dev/null
+++ b/apps/openstacknetworking/src/main/resources/deps/snakeyaml-1.15.jar
Binary files differ
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' ],
)
-
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",