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>

diff --git a/features/mdsal/features-mdsal/pom.xml b/features/mdsal/features-mdsal/pom.xml
index a00967a6ff1e7bd67c9451a35003fde3bec7fa9f..fc5b2395b927ab5e28126da2ed6d51efa9ee591d 100644 (file)
--- a/features/mdsal/features-mdsal/pom.xml
+++ b/features/mdsal/features-mdsal/pom.xml
@@ -68,7 +68,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
         </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>
             <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 985b64c0c0a2166d15c3ab3b680764dbcbd8a903..f75f649647f5ec465d24564482a30a9bfd4c7f0e 100644 (file)
--- 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>
     </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>
 
     <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 8dcf71402f0cda6be80bac063c99fb626b32694a..c0c1c6c7a70e5d24f34721ac32260ec0cd279717 100644 (file)
--- a/features/mdsal/odl-mdsal-broker-local/pom.xml
+++ b/features/mdsal/odl-mdsal-broker-local/pom.xml
@@ -79,13 +79,6 @@
     </dependencyManagement>
 
     <dependencies>
     </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>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>odl-yangtools-codec</artifactId>


@@ -122,6 +115,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
             <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>
         <!-- 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 3bb69627fe5b2afdf2ef2a7a10f3a1825a1666c6..cd0bbdf88375e5696c448ff9479a8a96209d7a30 100644 (file)
--- 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">
  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>
     <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 8ee3cce314ada169f97112b6bbd525e5e9aa4cd7..76e7d3b9596cce8fc36d65215c2171c7d7ca3c25 100644 (file)
--- 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>
     <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-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>
         <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 cfe1b71cf85443c0c8883c67fa44a68bce6f0fa1..07b065643f4614f8e682c5d58311377a51c9e566 100644 (file)
--- 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>
             </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>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>