Fixed yangtools feature file and consolodated

Change-Id: I3eb47439ad1f2baa25977be69516334df9279a3d
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/common/features/src/main/resources/features.xml b/common/features/src/main/resources/features.xml
index 968990aaa916dfb49232d522e8fbb80fce5e8e09..6782698c32dd34aef65e8774ae9c0e0487ef557f 100644 (file)
--- a/common/features/src/main/resources/features.xml
+++ b/common/features/src/main/resources/features.xml
@@ -11,7 +11,7 @@
 
     <feature name='yangtools-all' version='${project.version}'>
         <feature version='${project.version}'>yangtools-models</feature>
-        <feature version='${project.version}'>yangtools-binding</feature>
+        <feature version='${project.version}'>yangtools-data-binding</feature>
         <feature version='${project.version}'>yangtools-common</feature>
         <feature version='${project.version}'>yangtools-concepts</feature>
         <feature version='${project.version}'>yangtools-binding-generator</feature>
@@ -25,11 +25,11 @@
         <bundle>mvn:org.opendaylight.yangtools.model/ietf-topology/${ietf.topology.version}</bundle>
        </feature>
 
-    <feature name='yangtools-binding' version='${project.version}'>
+    <feature name='yangtools-data-binding' version='${project.version}'>
         <feature version='${project.version}'>yangtools-concepts</feature>
+        <feature version='${project.version}'>yangtools-binding</feature>
         <bundle>mvn:org.opendaylight.yangtools.thirdparty/antlr4-runtime-osgi-nohead/${antlr4.version}</bundle>
         <bundle>mvn:commons-io/commons-io/${commons.io.version}</bundle>
-        <bundle>mvn:org.opendaylight.yangtools/yang-binding/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-data-api/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-data-impl/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-data-json/${project.version}</bundle>
@@ -41,12 +41,17 @@
         <bundle>mvn:org.opendaylight.yangtools/yang-parser-api/${project.version}</bundle>
     </feature>
 
+    <feature name='yangtools-binding' version='${project.version}'>
+        <feature version='${project.version}'>yangtools-concepts</feature>
+        <bundle>mvn:com.google.guava/guava/${guava.version}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-binding/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/util/${project.version}</bundle>
+    </feature>
+
     <feature name='yangtools-concepts' version='${project.version}'>
         <bundle>mvn:org.opendaylight.yangtools/concepts/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-common/${project.version}</bundle>
-        <bundle>wrap:mvn:com.google.guava/guava/${guava.version}</bundle>
-        <bundle>wrap:mvn:org.eclipse.xtend/org.eclipse.xtend.lib/${xtend.version}</bundle>
-        <bundle>wrap:mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/${xtend.version}</bundle>
+        <bundle>mvn:com.google.guava/guava/${guava.version}</bundle>
     </feature>
     <feature name="yangtools-common" version='${project.version}'>
         <bundle>mvn:org.opendaylight.yangtools/util/${project.version}</bundle>
@@ -55,7 +60,7 @@
         <bundle>mvn:org.opendaylight.yangtools/object-cache-noop/${project.version}</bundle>
     </feature>
     <feature name='yangtools-binding-generator' version='${project.version}'>
-        <feature version='${project.version}'>yangtools-binding</feature>
+        <feature version='${project.version}'>yangtools-data-binding</feature>
         <bundle>mvn:org.javassist/javassist/${javassist.version}</bundle>
         <bundle>mvn:org.apache.commons/commons-lang3/${commons.lang3.version}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/binding-generator-api/${project.version}</bundle>
@@ -64,7 +69,11 @@
         <bundle>mvn:org.opendaylight.yangtools/binding-generator-util/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/binding-model-api/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/binding-type-provider/${project.version}</bundle>
-
+        <bundle>wrap:mvn:org.eclipse.xtend/org.eclipse.xtend.lib/${xtend.version}</bundle>
+        <bundle>wrap:mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/${xtend.version}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-model-api/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-model-util/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-parser-api/${project.version}</bundle>
     </feature>
 
 </features>