Refactor odl-mdsal-clustering-commons 13/81913/2
authorRobert Varga <robert.varga@pantheon.tech>
Mon, 6 May 2019 16:41:46 +0000 (18:41 +0200)
committerStephen Kitt <skitt@redhat.com>
Tue, 7 May 2019 08:09:26 +0000 (08:09 +0000)
odl-mdsal-clustering-commons does not have a dependency on
odl-mdsal-broker-local, hence we can factor it out to pull in
its upstream dependencies, thus fixing its tests.

JIRA: CONTROLLER-1584
Change-Id: Ie1df487329df8ea1295e0e2dc3b0e0f07e2e4037
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
features/mdsal/odl-mdsal-clustering-commons/pom.xml
features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml
features/mdsal/pom.xml

index 7b86107..e6ce2fd 100644 (file)
     <version>1.10.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <properties>
-        <!-- CONTROLLER-1584 -->
-        <skip.karaf.featureTest>true</skip.karaf.featureTest>
-    </properties>
+    <name>OpenDaylight :: Controller :: Clustering Commons</name>
+    <description>Common Clustering utilities</description>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yangtools-artifacts</artifactId>
+                <version>3.0.0</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-mdsal-broker-local</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-akka-system-2.5</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>odl-yangtools-data</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sal-clustering-commons</artifactId>
index 85426c1..71e9e5a 100644 (file)
@@ -14,5 +14,6 @@
         <feature version="[5,6)">odl-apache-commons-lang3</feature>
         <feature version="[5,6)">odl-dropwizard-metrics</feature>
         <feature version="[5,6)">odl-servlet-api</feature>
+        <feature version="[3,4)">odl-yangtools-data</feature>
     </feature>
 </features>
index 56887f7..6de0c4c 100644 (file)
 
     <modules>
         <module>features-mdsal</module>
+
         <module>odl-clustering-test-app</module>
         <module>odl-controller-mdsal-common</module>
         <module>odl-controller-binding-api</module>
         <module>odl-controller-dom-api</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-distributed-datastore</module>
         <module>odl-mdsal-model-inventory</module>
         <module>odl-controller-model-topology</module>

©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.