From 3af5cb9926238ba0fa802e0e067451a8e19f1c6a Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Tue, 17 May 2016 08:41:24 +0200
Subject: HONEYCOMB-63: bump ODL dependencies to BE-SR2

+ Remove dedicated reads to netconf-state in operational
datatree. Use regular reader from now on

Change-Id: I3d7245cd6cb5d9cf057aea600fddceb49cf18039
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---
 v3po/features/pom.xml                        | 12 ++++++------
 v3po/features/src/main/features/features.xml |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'v3po/features')

diff --git a/v3po/features/pom.xml b/v3po/features/pom.xml
index b79e62d92..b511e8f11 100644
--- a/v3po/features/pom.xml
+++ b/v3po/features/pom.xml
@@ -29,12 +29,12 @@
     <maven>3.1.1</maven>
   </prerequisites>
   <properties>
-    <mdsal.model.version>0.8.0-Beryllium</mdsal.model.version>
-    <mdsal.version>1.3.0-Beryllium</mdsal.version>
-    <restconf.version>1.3.0-Beryllium</restconf.version>
-    <netconf.version>1.0.0-Beryllium</netconf.version>
-    <yangtools.version>0.8.0-Beryllium</yangtools.version>
-    <dlux.version>0.3.0-Beryllium</dlux.version>
+    <mdsal.model.version>0.8.2-Beryllium-SR2</mdsal.model.version>
+    <mdsal.version>1.3.2-Beryllium-SR2</mdsal.version>
+    <restconf.version>1.3.2-Beryllium-SR2</restconf.version>
+    <netconf.version>1.0.2-Beryllium-SR2</netconf.version>
+    <yangtools.version>0.8.2-Beryllium-SR2</yangtools.version>
+    <dlux.version>0.3.2-Beryllium-SR2</dlux.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
   <dependencyManagement>
diff --git a/v3po/features/src/main/features/features.xml b/v3po/features/src/main/features/features.xml
index 98fc17aff..49208e7fa 100644
--- a/v3po/features/src/main/features/features.xml
+++ b/v3po/features/src/main/features/features.xml
@@ -51,14 +51,15 @@
     <configfile finalname="${configfile.directory}/v3po-context.xml">mvn:io.fd.honeycomb.v3po/v3po-impl/${project.version}/xml/context</configfile>
     <configfile finalname="${configfile.directory}/v3po.xml">mvn:io.fd.honeycomb.v3po/v3po-impl/${project.version}/xml/config</configfile>
     <configfile finalname="${configfile.directory}/v3po-init.xml">mvn:io.fd.honeycomb.v3po/v3po-impl/${project.version}/xml/init</configfile>
-    <configfile finalname="${configfile.directory}/v3po-netconf.xml">mvn:io.fd.honeycomb.v3po/v3po-impl/${project.version}/xml/netconf</configfile>
-    <configfile finalname="${configfile.directory}/v3po-restconf.xml">mvn:io.fd.honeycomb.v3po/v3po-impl/${project.version}/xml/restconf</configfile>
     <configfile finalname="${configfile.directory}/v3po2vpp.xml">mvn:io.fd.honeycomb.v3po/v3po2vpp/${project.version}/xml/config</configfile>
   </feature>
 
   <feature name='odl-v3po-rest' version='${project.version}' description='OpenDaylight :: v3po :: REST'>
     <feature version="${project.version}">odl-v3po</feature>
     <feature version="${restconf.version}">odl-restconf</feature>
+    <!-- Northbound interfaces configuration -->
+    <configfile finalname="${configfile.directory}/v3po-netconf.xml">mvn:io.fd.honeycomb.v3po/v3po-impl/${project.version}/xml/netconf</configfile>
+    <configfile finalname="${configfile.directory}/v3po-restconf.xml">mvn:io.fd.honeycomb.v3po/v3po-impl/${project.version}/xml/restconf</configfile>
   </feature>
 
   <feature name='odl-v3po-ui' version='${project.version}' description='OpenDaylight :: v3po :: UI'>
-- 
cgit 1.2.3-korg