From: Tony Tkacik <ttkacik@cisco.com>
Date: Wed, 17 Sep 2014 11:21:14 +0000 (+0000)
Subject: Merge "Bug 1926: fixed features/mdsal/pom.xml dependencies"
X-Git-Tag: release/helium~53
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=0a68f99edafff87254cd2ea0e758ce9fdbc6c61f;hp=fdd7aabc860e6e232203b8e77d6945bff1d99a37

Merge "Bug 1926: fixed features/mdsal/pom.xml dependencies"
---

diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml
index 960dfb37a1..f45f680c30 100644
--- a/features/mdsal/pom.xml
+++ b/features/mdsal/pom.xml
@@ -13,6 +13,7 @@
 
   <properties>
     <features.file>features.xml</features.file>
+    <org.json.version>20131018</org.json.version>
   </properties>
 
   <dependencies>
@@ -259,6 +260,20 @@
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.samples</groupId>
+      <artifactId>clustering-it-config</artifactId>
+      <version>${mdsal.version}</version>
+      <type>xml</type>
+      <classifier>testmoduleshardconf</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.samples</groupId>
+      <artifactId>clustering-it-config</artifactId>
+      <version>${mdsal.version}</version>
+      <type>xml</type>
+      <classifier>testmoduleconf</classifier>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-rest-docgen</artifactId>