Fixing yang_model macro to narrow down the dependency list.
Change-Id: I6ae11cec370bfca4a1e4fe0598f84c7e354ea5b8
diff --git a/bucklets/yang.bucklet b/bucklets/yang.bucklet
index 9b27589..93c9000 100644
--- a/bucklets/yang.bucklet
+++ b/bucklets/yang.bucklet
@@ -7,9 +7,15 @@
return ONOS_ARTIFACT_BASE + base_path.replace('/', '-') #TODO Unix-separator
YANG_TOOLS = [
- '//lib:CORE_DEPS',
- '//apps/yang:onos-apps-yang',
+ '//lib:guava',
+ '//lib:onos-yang-model',
+ '//lib:onos-yang-compiler-api',
'//lib:onos-yang-runtime',
+ '//lib:org.apache.felix.scr.annotations',
+ '//apps/yang:onos-apps-yang',
+ # FIXME: This following dependencies MUST be removed for the long-run; they are a violation of the design principle.
+ '//core/api:onos-api',
+ '//apps/config:onos-apps-config',
]
def yang_model(
diff --git a/tools/dev/bin/patch-yang-libs b/tools/dev/bin/patch-yang-libs
index 6e56ccc..d6ab3ea 100755
--- a/tools/dev/bin/patch-yang-libs
+++ b/tools/dev/bin/patch-yang-libs
@@ -3,7 +3,7 @@
# Patches lib/BUCK file to use locally built YANG tools.
# -----------------------------------------------------------------------------
-BVER=1.12.0-b6
+BVER=1.12.0-b7
SVER=1.12-SNAPSHOT
YANG_TOOLS_ROOT=~/onos-yang-tools