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>

diff --git a/features/mdsal/odl-mdsal-clustering-commons/pom.xml b/features/mdsal/odl-mdsal-clustering-commons/pom.xml
index 7b86107bd62d8201d0096869626fedabc6b50d47..e6ce2fd4250d05ee3f612c3cd944f127d722de23 100644 (file)
--- 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>
 
     <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>
 
     <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>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-akka-system-2.5</artifactId>


@@ -70,6 +73,13 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
             <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>
         <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 85426c19b4de23fd6c5062c28617a96ac5a76451..71e9e5ad75c4228d6f3444e86d52acb9a9c005b9 100644 (file)
--- 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="[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>
     </feature>
 </features>

diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml
index 56887f74e221bc79e1879e60e19f2619a2107c38..6de0c4cb0b54d706f28edd86587b0a0a27d8a476 100644 (file)
--- a/features/mdsal/pom.xml
+++ b/features/mdsal/pom.xml
@@ -23,15 +23,17 @@
 
     <modules>
         <module>features-mdsal</module>
 
     <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-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-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>
         <module>odl-mdsal-distributed-datastore</module>
         <module>odl-mdsal-model-inventory</module>
         <module>odl-controller-model-topology</module>