commit 5deaab5fdc25b141aff9dceeda3f21b6bdc6890e
author Sithara Punnassery <psithara@gmail.com> Mon Mar 06 14:23:07 2017 -0800
committer Thomas Vachuska <tom@onlab.us> Mon Mar 06 23:50:56 2017 +0000
tree 1ff64fd7d0e892ea90017269ef03b3ad288a8552
parent 563a7818e2b982dca36e3ac642e4951aa5de4062

Reverting the exclsuion of Yang runtime with fix for OSGI wiring issue

Change-Id: I23552cfb2f1fb8926500576c9039260890caf14e

apps/yang/BUCK

diff --git a/apps/yang/BUCK b/apps/yang/BUCK
index b0e29a3..8c0b321 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,6 +21,4 @@
     url = 'http://onosproject.org',
     description = 'Base application to bring in the YANG libraries and assemble them for other apps to use.',
     included_bundles = BUNDLES,
-)
-
-# FIXME: OSGI bundle conflict issue before including onos-yang-runtime.
\ No newline at end of file
+)
\ No newline at end of file

lib/BUCK

diff --git a/lib/BUCK b/lib/BUCK
index 9acb544..590e92b 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Mon, 6 Mar 2017 09:20:38 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Mon, 6 Mar 2017 22:12:12 GMT. Do not edit this file manually. *****
 # ***** Use onos-lib-gen *****
 
 pass_thru_pom(
@@ -1214,6 +1214,15 @@
 )
 
 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:1.12.0-b5',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
   name = 'org.apache.servicemix.bundles.dom4j',
   out = 'org.apache.servicemix.bundles.dom4j-1.6.1_5.jar',
   url = 'mvn:org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j:jar:1.6.1_5',

lib/deps.json

diff --git a/lib/deps.json b/lib/deps.json
index 956b9f9..99df312 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -35,7 +35,6 @@
       "onos-yang-utils-generator",
       "onos-yang-model",
       "onos-yang-compiler-api",
-//      "onos-yang-runtime",
       "org.apache.servicemix.bundles.dom4j",
       "onos-yang-maven-plugin"
     ],
@@ -214,7 +213,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",