From 3a71d1a912829b14bb474c5e4ab8afdf6f206e4b Mon Sep 17 00:00:00 2001
From: Michal Polkorab <michal.polkorab@pantheon.sk>
Date: Fri, 9 Jan 2015 09:43:25 +0100
Subject: [PATCH] Features updated (odl-mdsal-common)

 - features.xml updated with mdsal repository as odl-mdsal-common feature
   had been moved to new location
 - added dependency into features-openflowjava pom.xml
   (new odl-mdsal-common feature location)
 - introduced new property (mdsal.version)in parent pom.xml

Change-Id: I9854b88b6db970f0446fe5bb57057568ee118ce1
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
---
 features/pom.xml                         | 7 +++++++
 features/src/main/resources/features.xml | 3 ++-
 pom.xml                                  | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/features/pom.xml b/features/pom.xml
index 095f12b9..4308571f 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -31,6 +31,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-mdsal</artifactId>
+      <version>${mdsal.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
 
     <!-- bundle dependencies -->
     <dependency>
diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 87d05699..315fd338 100644
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -5,6 +5,7 @@
    xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-config/${config.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
     <feature name='odl-openflowjava-all' description="OpenDaylight :: Openflow Java :: All">
         <feature version='${project.version}'>odl-openflowjava-protocol</feature>
     </feature>
@@ -13,7 +14,7 @@
         <feature version='${yangtools.version}'>odl-yangtools-binding</feature>
         <feature version='${yangtools.version}'>odl-yangtools-models</feature>
         <feature version='${config.version}'>odl-config-api</feature>
-        <feature version='${yang.prototype.version}'>odl-mdsal-common</feature>
+        <feature version='${mdsal.version}'>odl-mdsal-common</feature>
         <bundle>mvn:io.netty/netty-buffer/${netty.version}</bundle>
         <bundle>mvn:io.netty/netty-common/${netty.version}</bundle>
         <bundle>mvn:io.netty/netty-transport/${netty.version}</bundle>
diff --git a/pom.xml b/pom.xml
index 67148ce6..f8d695db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,7 @@
         <releaseplugin.version>2.3.2</releaseplugin.version>
         <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
         <yangtools.generator.version>0.7.0-SNAPSHOT</yangtools.generator.version>
+        <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
 	<config.version>0.3.0-SNAPSHOT</config.version>
 
         <!-- Sonar config -->
-- 
2.36.6