Cleanup MRI feature references

odl-mdsal-broker should not be referenced by odl-netvirt-api,
but rather by odl-netvirt-impl. When it is referenced, the reference
should be made via a range.

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

diff --git a/features/odl-netvirt-api/pom.xml b/features/odl-netvirt-api/pom.xml
index 07e7936e9162c6eb132ee5f782520064031ff552..f3876aabfbdaecb854b377a9774cddf6116fdf43 100644 (file)
--- a/features/odl-netvirt-api/pom.xml
+++ b/features/odl-netvirt-api/pom.xml
@@ -49,12 +49,6 @@
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
             <artifactId>odl-genius-api</artifactId>

diff --git a/features/odl-netvirt-impl/pom.xml b/features/odl-netvirt-impl/pom.xml
index b8d7cdf44bf1ddccb99a403424cd727d2fdad17b..a67c1a52eaf45b87cefc3415d10ccd749df0d51c 100644 (file)
--- a/features/odl-netvirt-impl/pom.xml
+++ b/features/odl-netvirt-impl/pom.xml
@@ -22,7 +22,25 @@
     <packaging>feature</packaging>
     <modelVersion>4.0.0</modelVersion>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>controller-artifacts</artifactId>
+                <version>2.0.2</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
             <artifactId>odl-genius</artifactId>

diff --git a/features/odl-netvirt-impl/src/main/feature/feature.xml b/features/odl-netvirt-impl/src/main/feature/feature.xml
index b00c5aa5e03c6f7e33a4c12363e5627dff746ca1..22c068571a8c17d647eecd08272328d28b33cc8a 100644 (file)
--- a/features/odl-netvirt-impl/src/main/feature/feature.xml
+++ b/features/odl-netvirt-impl/src/main/feature/feature.xml
@@ -8,6 +8,7 @@
 -->
 <features name="odl-netvirt-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-netvirt-impl" version="${project.version}">
+        <feature version="[2,3)">odl-mdsal-broker</feature>
         <bundle>wrap:mvn:org.apache.thrift/libthrift/0.9.3$overwrite=merge&amp;Bundle-Version=0.9.3&amp;Export-Package=*;-noimport:=true;version="0.9.3"</bundle>
         <configfile finalname="etc/opendaylight/datastore/initial/config/netvirt-aclservice-config.xml">
             mvn:org.opendaylight.netvirt/aclservice-impl/${project.version}/xml/config