Merge "Migrate restconf dependencies"

diff --git a/features/pom.xml b/features/pom.xml
index c1cb3d88192817c202408539d349ca08b13e7cfa..8b9b4714907e16b1356fb9491abf00b43d8ab267 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -21,6 +21,7 @@
     <dlux.version>0.3.0-SNAPSHOT</dlux.version>
     <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
     <openflow.plugin.version>0.2.0-SNAPSHOT</openflow.plugin.version>
+    <restconf.version>1.3.0-SNAPSHOT</restconf.version>
   </properties>
 
   <dependencyManagement>
@@ -49,9 +50,10 @@
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
+      <groupId>org.opendaylight.netconf</groupId>
       <artifactId>features-restconf</artifactId>
       <classifier>features</classifier>
+      <version>${restconf.version}</version>
       <type>xml</type>
     </dependency>
     <dependency>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 4bed47affee8c0982c199a98cc9d6fc03e86e3e4..a62219532ca4d89156f93715e2db5a129ff90656 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -3,7 +3,7 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
   <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflow.plugin.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-restconf/${mdsal.version}/xml/features</repository>
+  <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository>
   <feature name='odl-l2switch-all' description="OpenDaylight :: L2Switch :: All" version='${project.version}'>
     <feature version="${project.version}">odl-l2switch-switch</feature>
@@ -15,11 +15,11 @@
   </feature>
   <feature name='odl-l2switch-switch-rest' description="OpenDaylight :: L2Switch :: Switch" version='${project.version}'>
     <feature version="${project.version}">odl-l2switch-switch</feature>
-    <feature version="${mdsal.version}">odl-restconf</feature>
+    <feature version="${restconf.version}">odl-restconf</feature>
   </feature>
   <feature name='odl-l2switch-switch-ui' description="OpenDaylight :: L2Switch :: Switch" version='${project.version}'>
     <feature version="${project.version}">odl-l2switch-switch-rest</feature>
-    <feature version="${mdsal.version}">odl-mdsal-apidocs</feature>
+    <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
     <feature version="${mdsal.version}">odl-mdsal-xsql</feature>
     <feature version="${dlux.version}">odl-dlux-core</feature>
   </feature>