Use odl-mdsal-broker in odl-mdsal-binding-dom-adapter

Binding API implementations ride on top of DOM implementations,
which are provided by odl-mdsal-dom-broker. Make sure we express
that in packaging. Solves duplicate packaging of mdsal-dom-broker.

JIRA: MDSAL-560
Change-Id: I6c0da82473d0c65b3586a3f8fcf9f5fa7b815352
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 4605d53ab4ce5bca477acb10b4f53fda18b0d54a)

diff --git a/features/odl-mdsal-binding-dom-adapter/pom.xml b/features/odl-mdsal-binding-dom-adapter/pom.xml
index 9c8eb8eafa8d28b5b960e404e0f602621401a2e3..1ed32d239b2b64b8bdcff193ecdc1ddf40e050e5 100644 (file)
--- a/features/odl-mdsal-binding-dom-adapter/pom.xml
+++ b/features/odl-mdsal-binding-dom-adapter/pom.xml
@@ -21,12 +21,6 @@
     <description>MD-SAL Java Binding/DOM adapter</description>
 
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-lmax-3</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-runtime</artifactId>
@@ -41,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>odl-mdsal-dom-api</artifactId>
+            <artifactId>odl-mdsal-dom-broker</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-mdsal-binding-dom-adapter/src/main/feature/feature.xml b/features/odl-mdsal-binding-dom-adapter/src/main/feature/feature.xml
deleted file mode 100644 (file)
index aa0c4e1..0000000
--- a/features/odl-mdsal-binding-dom-adapter/src/main/feature/feature.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-mdsal-dom-api">
-    <feature name="odl-mdsal-binding-dom-adapter">
-        <feature version="[6,7)">odl-lmax-3</feature>
-    </feature>
-</features>