From 81e90a90da5a4cd705d13dc0d1922ec8cccca956 Mon Sep 17 00:00:00 2001
From: Deepthi V V <deepthi.v.v@ericsson.com>
Date: Fri, 10 Apr 2015 15:20:17 +0530
Subject: [PATCH] Integration build failure fix:

Fix features for inventory manager bundle and model-bgp bundle.

Signed-off-by: Deepthi V V <deepthi.v.v@ericsson.com>
Change-Id: Id7a8234998aa27ea837af254560b4c1c172cda58
---
 features/pom.xml                        | 23 +++++++++--------------
 features/src/main/features/features.xml |  6 +++---
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/features/pom.xml b/features/pom.xml
index 791a11a0..c9514273 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -22,6 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   </prerequisites>
   <properties>
     <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
+    <openflowplugin.version>0.1.0-SNAPSHOT</openflowplugin.version>
     <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
     <interfacemgr.version>0.0.1-SNAPSHOT</interfacemgr.version>
   </properties>
@@ -55,9 +56,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-flow</artifactId>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>features-openflowplugin</artifactId>
       <classifier>features</classifier>
+      <version>${openflowplugin.version}</version>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
@@ -120,22 +122,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>bgpmanager-api</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <!--<dependency>
-      <groupId>${project.groupId}.third-party</groupId>
-      <artifactId>org.apache.thriftlib</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
-    </dependency>-->
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>model-bgp</artifactId>
+      <version>2013.07.15.7-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
       <version>0.9.1</version>
     </dependency>
-    <!--
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
-    </dependency>
-    -->
   </dependencies>
 </project>
diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 390fbaa6..684ed855 100644
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -12,12 +12,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   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-mdsal/${mdsal.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-flow/${mdsal.version}/xml/features</repository>
+  <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflowplugin.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.controller/features-restconf/${mdsal.version}/xml/features</repository>
   <feature name='odl-vpnservice-api' version='${project.version}' description='OpenDaylight :: vpnservice :: api '>
     <feature version='${yangtools.version}'>odl-yangtools-models</feature>
-    <feature version='${mdsal.version}'>odl-flow-model</feature>
-    <bundle>mvn:org.opendaylight.vpnservice/model-bgp/2013.07.15.7-SNAPSHOT</bundle>
+    <feature version='${openflowplugin.version}'>odl-openflowplugin-nsf-model</feature>
+    <bundle>mvn:org.opendaylight.vpnservice/model-bgp/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.vpnservice/vpnmanager-api/${project.version}</bundle>
     <bundle>mvn:org.opendaylight.vpnservice/interfacemgr-api/${interfacemgr.version}</bundle>
     <bundle>mvn:org.opendaylight.vpnservice/bgpmanager-api/${project.version}</bundle>
-- 
2.36.6