From 38d801241e7eaa9d751bb1868efb773de3a84dd8 Mon Sep 17 00:00:00 2001
From: Stephen Kitt <skitt@redhat.com>
Date: Thu, 15 Dec 2016 14:40:45 +0100
Subject: [PATCH] BUG-4219: clean up features.xml

In models' features.xml, odl-mdsal-binding-base includes yang-ext so
it's not strictly necessary in odl-mdsal-models. (This is potentially
controversial of course since it should perhaps be construed as a
declared part of the odl-mdsal-models API.)

In mdsal's features.xml:
* use odl-lmax-3 instead of odl-lmax;
* drop mdsal-dom-{api,spi} from odl-mdsal-dom-broker (they're part of
  odl-mdsal-dom-api);
* odl-mdsal-binding-api needs odl-yangtools-yang-parser, and
  mdsal-binding-util;
* odl-mdsal-singleton-dom needs odl-mdsal-common.

Change-Id: I4f18d697065f4e9df2b0e621fd32d4b18b8068fd
Signed-off-by: Stephen Kitt <skitt@redhat.com>
---
 common/features/pom.xml                        | 3 ++-
 common/features/src/main/features/features.xml | 7 ++++---
 model/features/src/main/features/features.xml  | 1 -
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/features/pom.xml b/common/features/pom.xml
index 31bf8556f9..a8c8c0c378 100644
--- a/common/features/pom.xml
+++ b/common/features/pom.xml
@@ -22,6 +22,7 @@
     <packaging>jar</packaging>
 
     <properties>
+        <odlparent.version>1.8.0-SNAPSHOT</odlparent.version>
         <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
     </properties>
 
@@ -30,7 +31,7 @@
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odlparent-artifacts</artifactId>
-                <version>1.8.0-SNAPSHOT</version>
+                <version>${odlparent.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/common/features/src/main/features/features.xml b/common/features/src/main/features/features.xml
index 0e6b88cb32..50b29417b5 100644
--- a/common/features/src/main/features/features.xml
+++ b/common/features/src/main/features/features.xml
@@ -37,10 +37,8 @@
 
     <feature name='odl-mdsal-dom-broker' version='${project.version}' description='OpenDaylight :: MD-SAL :: DOM Broker'>
         <feature version='${yangtools.version}' dependency="true">odl-yangtools-yang-parser</feature>
-        <feature version='[3.3.0,4.0.0)' dependency="true">odl-lmax</feature>
+        <feature version="${odlparent.version}" dependency="true">odl-lmax-3</feature>
         <feature version='${project.version}' dependency="true">odl-mdsal-dom-api</feature>
-        <bundle>mvn:org.opendaylight.mdsal/mdsal-dom-api/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.mdsal/mdsal-dom-spi/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.mdsal/mdsal-dom-broker/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.mdsal/mdsal-dom-inmemory-datastore/{{VERSION}}</bundle>
     </feature>
@@ -66,8 +64,10 @@
     <feature name='odl-mdsal-binding-api' version='${project.version}' description='OpenDaylight :: MD-SAL :: Binding Base Concepts'>
         <feature version='${project.version}' dependency="true">odl-mdsal-common</feature>
         <feature version='${project.version}' dependency="true">odl-mdsal-binding-base</feature>
+        <feature version="${yangtools.version}" dependency="true">odl-yangtools-yang-parser</feature>
         <bundle>mvn:org.opendaylight.mdsal.model/general-entity/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.mdsal/mdsal-binding-api/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.mdsal/mdsal-binding-util/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-mdsal-binding-dom-adapter' version='${project.version}' description='OpenDaylight :: MD-SAL :: Binding Generator'>
@@ -104,6 +104,7 @@
     <feature name='odl-mdsal-singleton-dom' version='${project.version}' description='OpenDaylight :: MD-SAL :: Singleton :: DOM'>
         <feature version='${project.version}' dependency="true">odl-mdsal-singleton-common</feature>
         <feature version='${project.version}' dependency="true">odl-mdsal-eos-dom</feature>
+        <feature version="${project.version}" dependency="true">odl-mdsal-common</feature>
         <bundle>mvn:org.opendaylight.mdsal/mdsal-singleton-dom-impl/{{VERSION}}</bundle>
     </feature>
 
diff --git a/model/features/src/main/features/features.xml b/model/features/src/main/features/features.xml
index 5f7812851f..3cbc37a58b 100644
--- a/model/features/src/main/features/features.xml
+++ b/model/features/src/main/features/features.xml
@@ -22,7 +22,6 @@
         <bundle>mvn:org.opendaylight.mdsal.model/ietf-yang-types/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.mdsal.model/ietf-yang-types-20130715/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.mdsal.model/ietf-restconf/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.mdsal.model/yang-ext/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.mdsal.model/opendaylight-l2-types/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.mdsal.model/ietf-ted/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.mdsal.model/ietf-topology/{{VERSION}}</bundle>
-- 
2.36.6