Ensure bundles are present in a single feature

The following bundles are currently included in multiple features:
* southbound-api
* utils.config
* utils.mdsal-utils
* utils.southbound-utils

This patch ensures that the relevant feature is used wherever
appropriate, so that each of these bundles is only included in a
single feature.

Change-Id: Id5cc79998297a2e72aaec4e041728abb4b9b8ad3
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml
index 44ca32ece5d4bd7ac38ae2126b7a0bc5e99df092..24f2356af7b6f4525dd405e7cb9631725f1700d8 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml
@@ -49,6 +49,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.ovsdb</groupId>
+            <artifactId>odl-ovsdb-utils</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>hwvtepsouthbound-impl</artifactId>

diff --git a/southbound/southbound-features/odl-ovsdb-southbound-test/pom.xml b/southbound/southbound-features/odl-ovsdb-southbound-test/pom.xml
index bca7517c108bfb410c8376b94b1fe139ce9d9569..8748b1709fa2bc17dadaa1aebfa97eaad6a85eda 100644 (file)
--- a/southbound/southbound-features/odl-ovsdb-southbound-test/pom.xml
+++ b/southbound/southbound-features/odl-ovsdb-southbound-test/pom.xml
@@ -36,14 +36,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>utils.mdsal-utils</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>utils.southbound-utils</artifactId>
+            <groupId>org.opendaylight.ovsdb</groupId>
+            <artifactId>odl-ovsdb-utils</artifactId>
             <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
             <!-- finalname="etc/org.opendaylight.ovsdb.southbound.cfg" -->

diff --git a/utils/mdsal-utils/pom.xml b/utils/mdsal-utils/pom.xml
index fc7d5dffa899b97c47cf5c5a3d36a6a1a48fae98..dd301ae1aab5e6dce2f2c98db4ddd7b77f049bdf 100644 (file)
--- a/utils/mdsal-utils/pom.xml
+++ b/utils/mdsal-utils/pom.xml
@@ -30,11 +30,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>southbound-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
 
     <!-- testing dependencies -->
     <dependency>
@@ -47,6 +42,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>southbound-api</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-broker-impl</artifactId>

diff --git a/utils/odl-ovsdb-utils/pom.xml b/utils/odl-ovsdb-utils/pom.xml
index a5e3e062bb413c8377ab5cdbfe21d424c27b509e..20e98a556748f703ea0d37aade46b8d8d28fef1f 100644 (file)
--- a/utils/odl-ovsdb-utils/pom.xml
+++ b/utils/odl-ovsdb-utils/pom.xml
@@ -39,6 +39,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.ovsdb</groupId>
+            <artifactId>odl-ovsdb-southbound-api</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>utils.config</artifactId>