From 120069b3d0d2436ce0398ac871a45fe710c4fbdd Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 25 Jan 2018 16:26:27 +0100
Subject: [PATCH] Rename odl-mdsal-common to odl-controller-mdsal-common

Feature names are a flat namespace and odl-mdsal-common is conflicting
with a feature provided by mdsal. Since odl-mdsal- is mdsal's part
of the namespace, rename the feature to be in controller's namespace.

Change-Id: I986ae7574caea1f2a32b802a5b2a5873d6ac8c60
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 features/mdsal/features-mdsal/pom.xml               |  2 +-
 .../pom.xml                                         |  2 +-
 features/mdsal/odl-mdsal-broker-local/pom.xml       | 13 ++++++-------
 .../src/main/feature/feature.xml                    |  2 --
 features/mdsal/pom.xml                              |  2 +-
 opendaylight/md-sal/mdsal-artifacts/pom.xml         |  2 +-
 6 files changed, 10 insertions(+), 13 deletions(-)
 rename features/mdsal/{odl-mdsal-common => odl-controller-mdsal-common}/pom.xml (97%)

diff --git a/features/mdsal/features-mdsal/pom.xml b/features/mdsal/features-mdsal/pom.xml
index a00967a6ff..fc5b2395b9 100644
--- a/features/mdsal/features-mdsal/pom.xml
+++ b/features/mdsal/features-mdsal/pom.xml
@@ -68,7 +68,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-mdsal-common</artifactId>
+            <artifactId>odl-controller-mdsal-common</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
diff --git a/features/mdsal/odl-mdsal-common/pom.xml b/features/mdsal/odl-controller-mdsal-common/pom.xml
similarity index 97%
rename from features/mdsal/odl-mdsal-common/pom.xml
rename to features/mdsal/odl-controller-mdsal-common/pom.xml
index 985b64c0c0..f75f649647 100644
--- a/features/mdsal/odl-mdsal-common/pom.xml
+++ b/features/mdsal/odl-controller-mdsal-common/pom.xml
@@ -19,7 +19,7 @@
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
-    <artifactId>odl-mdsal-common</artifactId>
+    <artifactId>odl-controller-mdsal-common</artifactId>
     <version>1.7.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml
index 8dcf71402f..c0c1c6c7a7 100644
--- a/features/mdsal/odl-mdsal-broker-local/pom.xml
+++ b/features/mdsal/odl-mdsal-broker-local/pom.xml
@@ -79,13 +79,6 @@
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <!-- This needs to come first, otherwise mdsal's odl-mdsal-common is picked instead -->
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-common</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>odl-yangtools-codec</artifactId>
@@ -122,6 +115,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-controller-mdsal-common</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <!-- FIXME: Bug 4202: Add MD-SAL provided odl-mdsal-binding-adapter -->
         <!-- FIXME: Bug 4202: Add MD-SAL provided odl-mdsal-dom-broker -->
         <dependency>
diff --git a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
index 3bb69627fe..cd0bbdf883 100644
--- a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
+++ b/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
@@ -7,8 +7,6 @@
  and is available at http://www.eclipse.org/legal/epl-v10.html
  -->
 <features name="odl-mdsal-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
-    <!-- This needs to be added manually until we resolve the odl-mdsal-common situation -->
-    <repository>mvn:org.opendaylight.controller/odl-mdsal-common/${project.version}/xml/features</repository>
     <feature name="odl-mdsal-broker-local" version="${project.version}">
         <feature version="[3.0.0,4)">odl-lmax-3</feature>
         <feature version="[2.0.1,3)">odl-yangtools-codec</feature>
diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml
index 8ee3cce314..76e7d3b959 100644
--- a/features/mdsal/pom.xml
+++ b/features/mdsal/pom.xml
@@ -25,12 +25,12 @@
     <modules>
         <module>features-mdsal</module>
         <module>odl-clustering-test-app</module>
+        <module>odl-controller-mdsal-common</module>
         <module>odl-mdsal-all</module>
         <module>odl-mdsal-broker</module>
         <module>odl-mdsal-broker-local</module>
         <module>odl-mdsal-clustering</module>
         <module>odl-mdsal-clustering-commons</module>
-        <module>odl-mdsal-common</module>
         <module>odl-mdsal-distributed-datastore</module>
         <module>odl-mdsal-model-inventory</module>
         <module>odl-mdsal-remoterpc-connector</module>
diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/opendaylight/md-sal/mdsal-artifacts/pom.xml
index cfe1b71cf8..07b065643f 100644
--- a/opendaylight/md-sal/mdsal-artifacts/pom.xml
+++ b/opendaylight/md-sal/mdsal-artifacts/pom.xml
@@ -334,7 +334,7 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-common</artifactId>
+                <artifactId>odl-controller-mdsal-common</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
-- 
2.36.6