Rename odl-mdsal-common to odl-controller-mdsal-common 78/67578/6
authorRobert Varga <robert.varga@pantheon.tech>
Thu, 25 Jan 2018 15:26:27 +0000 (16:26 +0100)
committerTom Pantelis <tompantelis@gmail.com>
Mon, 29 Jan 2018 23:47:04 +0000 (23:47 +0000)
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
features/mdsal/odl-controller-mdsal-common/pom.xml [moved from features/mdsal/odl-mdsal-common/pom.xml with 97% similarity]
features/mdsal/odl-mdsal-broker-local/pom.xml
features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
features/mdsal/pom.xml
opendaylight/md-sal/mdsal-artifacts/pom.xml

index a00967a..fc5b239 100644 (file)
@@ -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>
similarity index 97%
rename from features/mdsal/odl-mdsal-common/pom.xml
rename to features/mdsal/odl-controller-mdsal-common/pom.xml
index 985b64c..f75f649 100644 (file)
@@ -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>
 
index 8dcf714..c0c1c6c 100644 (file)
     </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>
             <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>
index 3bb6962..cd0bbdf 100644 (file)
@@ -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>
index 8ee3cce..76e7d3b 100644 (file)
     <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>
index cfe1b71..07b0656 100644 (file)
             </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>

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.