Migrate restconf dependencies

Change-Id: I4ca3d812e80172c9398cbd6043fa6b710cae57cd
Signed-off-by: Tomas Cere <tcere@cisco.com>

diff --git a/features-li/pom.xml b/features-li/pom.xml
index 5c44ebf912af05d795382694c7b568c498e8ba6b..984e48f0094ecd9296391d6d5d44e326434ed6a7 100644 (file)
--- a/features-li/pom.xml
+++ b/features-li/pom.xml
@@ -17,6 +17,7 @@
         <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
         <config.statistics.manager.configfile>30-statistics-manager.xml</config.statistics.manager.configfile>
         <controller.model.version>1.3.0-SNAPSHOT</controller.model.version>
+        <restconf.version>1.3.0-SNAPSHOT</restconf.version>
     </properties>
 
     <dependencies>
@@ -36,9 +37,9 @@
             <type>xml</type>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>features-restconf</artifactId>
-            <version>${mdsal.version}</version>
+            <version>${restconf.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>

diff --git a/features-li/src/main/resources/features.xml b/features-li/src/main/resources/features.xml
index 5d858f759ce6d35752f19a5223c9892b44d3c520..6ce441fd3eb264e890eadb48a9c7bbae58d9cfc6 100644 (file)
--- a/features-li/src/main/resources/features.xml
+++ b/features-li/src/main/resources/features.xml
@@ -12,7 +12,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.controller/features-mdsal/${mdsal.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.openflowjava/features-openflowjava/${openflowjava.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
@@ -74,12 +74,12 @@
 
     <feature name='odl-openflowplugin-flow-services-rest-li' description="OpenDaylight :: Openflow Plugin :: Flow Services :: REST" version='${project.version}'>
         <feature version="${project.version}">odl-openflowplugin-flow-services-li</feature>
-        <feature version="${mdsal.version}">odl-restconf</feature>
+        <feature version="${restconf.version}">odl-restconf</feature>
     </feature>
     <feature name='odl-openflowplugin-flow-services-ui-li' description="OpenDaylight :: Openflow Plugin :: Flow Services :: UI" version='${project.version}'>
         <feature version="${project.version}">odl-openflowplugin-flow-services-rest-li</feature>
         <feature version="${dlux.version}">odl-dlux-core</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>
 

diff --git a/features/pom.xml b/features/pom.xml
index a37891d9c6e6ecd98b711b74f7e729a6f4cbd362..1f4126b100117ac84392e4384c112d504e5ebd0a 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -18,6 +18,7 @@
         <config.statistics.manager.configfile>30-statistics-manager.xml</config.statistics.manager.configfile>
         <config.inventory.manager.configfile>40-inventory-manager.xml</config.inventory.manager.configfile>
         <controller.model.version>1.3.0-SNAPSHOT</controller.model.version>
+        <restconf.version>1.3.0-SNAPSHOT</restconf.version>
     </properties>
 
     <dependencies>
@@ -37,9 +38,9 @@
             <type>xml</type>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>features-restconf</artifactId>
-            <version>${mdsal.version}</version>
+            <version>${restconf.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 2d6a321c6af4eec748d27f37cd7ccf408dacd6a5..27892f027859864a2fa32cfe9c08303c58c74092 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -12,7 +12,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.controller/features-mdsal/${mdsal.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.openflowjava/features-openflowjava/${openflowjava.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
@@ -76,12 +76,12 @@
 
     <feature name='odl-openflowplugin-flow-services-rest' description="OpenDaylight :: Openflow Plugin :: Flow Services :: REST" version='${project.version}'>
         <feature version="${project.version}">odl-openflowplugin-flow-services</feature>
-        <feature version="${mdsal.version}">odl-restconf</feature>
+        <feature version="${restconf.version}">odl-restconf</feature>
     </feature>
     <feature name='odl-openflowplugin-flow-services-ui' description="OpenDaylight :: Openflow Plugin :: Flow Services :: UI" version='${project.version}'>
         <feature version="${project.version}">odl-openflowplugin-flow-services-rest</feature>
         <feature version="${dlux.version}">odl-dlux-core</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>