Reverting back the YANG runtime bundle inclusion to fix broken running environment.
Change-Id: Id4216894a41a37472dbe92d31ab3251babfa4b75
diff --git a/apps/yang/BUCK b/apps/yang/BUCK
index 8c0b321..b0e29a3 100644
--- a/apps/yang/BUCK
+++ b/apps/yang/BUCK
@@ -2,13 +2,13 @@
'//lib:CORE_DEPS',
'//lib:onos-yang-model',
'//lib:onos-yang-compiler-api',
- '//lib:onos-yang-runtime',
+# '//lib:onos-yang-runtime',
]
BUNDLES = [
'//lib:onos-yang-model',
'//lib:onos-yang-compiler-api',
- '//lib:onos-yang-runtime',
+# '//lib:onos-yang-runtime',
]
osgi_jar (
@@ -21,4 +21,6 @@
url = 'http://onosproject.org',
description = 'Base application to bring in the YANG libraries and assemble them for other apps to use.',
included_bundles = BUNDLES,
-)
\ No newline at end of file
+)
+
+# FIXME: OSGI bundle conflict issue before including onos-yang-runtime.
\ No newline at end of file
diff --git a/lib/BUCK b/lib/BUCK
index 57ee7a0..9acb544 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Tue, 28 Feb 2017 04:50:50 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Mon, 6 Mar 2017 09:20:38 GMT. Do not edit this file manually. *****
# ***** Use onos-lib-gen *****
pass_thru_pom(
@@ -46,7 +46,6 @@
':onos-yang-utils-generator',
':onos-yang-model',
':onos-yang-compiler-api',
- ':onos-yang-runtime',
':org.apache.servicemix.bundles.dom4j',
':onos-yang-maven-plugin',
],
@@ -1201,7 +1200,7 @@
out = 'onos-yang-model-1.12.0-b5.jar',
url = 'mvn:org.onosproject:onos-yang-model:jar:1.12.0-b5',
sha1 = '802d4dde9f27a14ed790ad57259cf6be484f789e',
- maven_coords = 'org.onosproject:onos-yang-model:jar:NON-OSGI:1.12.0-b5',
+ maven_coords = 'org.onosproject:onos-yang-model:1.12.0-b5',
visibility = [ 'PUBLIC' ],
)
@@ -1210,16 +1209,7 @@
out = 'onos-yang-compiler-api-1.12.0-b5.jar',
url = 'mvn:org.onosproject:onos-yang-compiler-api:jar:1.12.0-b5',
sha1 = 'e38e65bcc5c1fb5619a491f259f1354dce6af187',
- maven_coords = 'org.onosproject:onos-yang-compiler-api:jar:NON-OSGI:1.12.0-b5',
- visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
- name = 'onos-yang-runtime',
- out = 'onos-yang-runtime-1.12.0-b5.jar',
- url = 'mvn:org.onosproject:onos-yang-runtime:jar:1.12.0-b5',
- sha1 = 'c41c166f852731ca5375d65f0e89a1502a80f716',
- maven_coords = 'org.onosproject:onos-yang-runtime:jar:NON-OSGI:1.12.0-b5',
+ maven_coords = 'org.onosproject:onos-yang-compiler-api:1.12.0-b5',
visibility = [ 'PUBLIC' ],
)
diff --git a/lib/deps.json b/lib/deps.json
index b1cfafc..956b9f9 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -35,7 +35,7 @@
"onos-yang-utils-generator",
"onos-yang-model",
"onos-yang-compiler-api",
- "onos-yang-runtime",
+// "onos-yang-runtime",
"org.apache.servicemix.bundles.dom4j",
"onos-yang-maven-plugin"
],
@@ -214,7 +214,7 @@
"onos-yang-utils-generator": "mvn:org.onosproject:onos-yang-utils-generator:1.11",
"onos-yang-model":"mvn:org.onosproject:onos-yang-model:1.12.0-b5",
"onos-yang-compiler-api":"mvn:org.onosproject:onos-yang-compiler-api:1.12.0-b5",
- "onos-yang-runtime":"mvn:org.onosproject:onos-yang-runtime:1.12.0-b5",
+// "onos-yang-runtime":"mvn:org.onosproject:onos-yang-runtime:1.12.0-b5",
"org.apache.servicemix.bundles.dom4j":"mvn:org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j:1.6.1_5",
"openflowj-3.0": {
"uri": "mvn:org.projectfloodlight:openflowj:3.0.0-SNAPSHOT",