From 2640fe68e478020a4d82b55326b94944485023b3 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 6 May 2019 18:41:46 +0200
Subject: [PATCH] Refactor odl-mdsal-clustering-commons

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>
---
 .../odl-mdsal-clustering-commons/pom.xml      | 32 ++++++++++++-------
 .../src/main/feature/feature.xml              |  1 +
 features/mdsal/pom.xml                        |  4 ++-
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/features/mdsal/odl-mdsal-clustering-commons/pom.xml b/features/mdsal/odl-mdsal-clustering-commons/pom.xml
index 7b86107bd6..e6ce2fd425 100644
--- a/features/mdsal/odl-mdsal-clustering-commons/pom.xml
+++ b/features/mdsal/odl-mdsal-clustering-commons/pom.xml
@@ -21,19 +21,22 @@
     <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>
@@ -70,6 +73,13 @@
             <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>
diff --git a/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml
index 85426c19b4..71e9e5ad75 100644
--- a/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml
+++ b/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml
@@ -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>
diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml
index 56887f74e2..6de0c4cb0b 100644
--- a/features/mdsal/pom.xml
+++ b/features/mdsal/pom.xml
@@ -23,15 +23,17 @@
 
     <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>
-- 
2.36.6