Reference yangtools via feature instead of bundles.

Change-Id: Ib653fe160dd6806c9b44e8eb64c589e6eed308b7
Signed-off-by: Andrej Mak <andmak@cisco.com>

diff --git a/features/netconf/src/main/features/features.xml b/features/netconf/src/main/features/features.xml
index e5a6a0a06a7231f4afbc653aec0d410734ead33e..e547e7572f68b48c52972af0e3dffd423143f13e 100644 (file)
--- a/features/netconf/src/main/features/features.xml
+++ b/features/netconf/src/main/features/features.xml
@@ -23,8 +23,7 @@
 
   <feature name='odl-netconf-api' version='${project.version}' description="OpenDaylight :: Netconf :: API">
     <feature version='${protocol-framework.version}'>odl-protocol-framework</feature>
-    <!-- FIXME: Reference YANGTools via feateure instead of bundles -->
-    <bundle>mvn:org.opendaylight.yangtools/yang-model-api/{{VERSION}}</bundle>
+    <feature version='${yangtools.version}'>odl-yangtools-yang-data</feature>
     <bundle>mvn:org.opendaylight.controller/config-util/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netconf/netconf-api/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netconf/netconf-auth/{{VERSION}}</bundle>
@@ -45,8 +44,7 @@
 
   <feature name='odl-netconf-util' version='${project.version}'>
     <feature version='${project.version}'>odl-netconf-mapping-api</feature>
-    <bundle>mvn:org.opendaylight.yangtools/yang-model-api/{{VERSION}}</bundle>
-    <bundle>mvn:org.opendaylight.yangtools/yang-data-api/{{VERSION}}</bundle>
+    <feature version='${yangtools.version}'>odl-yangtools-yang-data</feature>
     <bundle>mvn:org.opendaylight.netconf/netconf-util/{{VERSION}}</bundle>
   </feature>