Fix feature dependencies

Even after migrations, features should depend on odl-mdsal-broker,
not dom-broker, as otherwise they do not correctly squash their
dependencies and they will fail to bring in the implementation.

Change-Id: I4633ed8dacc191f42fad27b8fd624beecf888d2f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/bgpcep-extras/odl-bgpcep-data-change-counter/pom.xml b/features/bgpcep-extras/odl-bgpcep-data-change-counter/pom.xml
index f54b3fc6c5abd0b38ce992abb8f2233b32932e6b..505ff4986f82e3561e26db04d843fada819cc523 100644 (file)
--- a/features/bgpcep-extras/odl-bgpcep-data-change-counter/pom.xml
+++ b/features/bgpcep-extras/odl-bgpcep-data-change-counter/pom.xml
@@ -39,8 +39,8 @@
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>odl-mdsal-dom-broker</artifactId>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/pcep/odl-bgpcep-pcep-cli/pom.xml b/features/pcep/odl-bgpcep-pcep-cli/pom.xml
index 1ad5a821a021f4bfb8c728dcff91b45adb427cf1..8d079787b53d92d5245ab7d74f9b8595bb29d4bb 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-cli/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-cli/pom.xml
@@ -33,8 +33,8 @@
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>odl-mdsal-dom-broker</artifactId>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/pcep/odl-bgpcep-pcep-topology-stats/pom.xml b/features/pcep/odl-bgpcep-pcep-topology-stats/pom.xml
index cbf78370acd51af72fa2aaffc954cbb55007bcae..48f8f226bfc764bb7cd9475e613fcd2fc81d9526 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-topology-stats/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-topology-stats/pom.xml
@@ -27,8 +27,8 @@
             <artifactId>pcep-topology-stats</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>odl-mdsal-dom-broker</artifactId>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/pcep/odl-bgpcep-programming-impl/pom.xml b/features/pcep/odl-bgpcep-programming-impl/pom.xml
index 6049854f31994b46f497d5a941143849d8525a84..68e4143ea1e56404986b37d9046bd01a4972702d 100644 (file)
--- a/features/pcep/odl-bgpcep-programming-impl/pom.xml
+++ b/features/pcep/odl-bgpcep-programming-impl/pom.xml
@@ -33,8 +33,8 @@
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>odl-mdsal-dom-broker</artifactId>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>