From: Tomas Cere <tcere@cisco.com>
Date: Mon, 31 Aug 2015 15:18:39 +0000 (+0200)
Subject: Migrate netconf/restconf dependencies
X-Git-Tag: release/beryllium~123^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F39%2F26239%2F8;p=sfc.git

Migrate netconf/restconf dependencies

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

diff --git a/features-sfc-netconf/pom.xml b/features-sfc-netconf/pom.xml
index eef254d8f..821c52dff 100644
--- a/features-sfc-netconf/pom.xml
+++ b/features-sfc-netconf/pom.xml
@@ -54,6 +54,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
         <groupId>org.opendaylight.controller.model</groupId>
         <artifactId>model-inventory</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>features-netconf-connector</artifactId>
+        <version>${netconf.parent.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>features-netconf-connector</artifactId>
+        <version>${netconf.parent.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
     </dependency>
      <!-- dependency for opendaylight-karaf-empty for use by testing -->
     <dependency>
diff --git a/features-sfc-netconf/src/main/resources/features.xml b/features-sfc-netconf/src/main/resources/features.xml
index 1e02dfe4b..823fdf46b 100644
--- a/features-sfc-netconf/src/main/resources/features.xml
+++ b/features-sfc-netconf/src/main/resources/features.xml
@@ -12,15 +12,15 @@ 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.controller/features-mdsal/${mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.sfc/features-sfc/${project.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-netconf-connector/${mdsal.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-restconf/${mdsal.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.netconf/features-netconf-connector/${netconf.parent.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
     <feature name='odl-sfc-netconf' version='${project.version}' description='OpenDaylight :: Netconf '>
 
         <feature version='${project.version}'>odl-sfc-provider-rest</feature>
         <!--<feature version='${project.version}'>odl-sfc-model</feature>-->
         <!--<feature version='${mdsal.version}'>odl-mdsal-broker</feature>-->
-        <feature version='${mdsal.version}'>odl-netconf-connector-all</feature>
-        <feature version='${mdsal.version}'>odl-netconf-connector-ssh</feature>
+        <feature version='${netconf.parent.version}'>odl-netconf-connector-all</feature>
+        <feature version='${netconf.parent.version}'>odl-netconf-connector-ssh</feature>
         <feature version='${mdsal.version}'>odl-netconf-mdsal</feature>
         <!--<feature version="${mdsal.version}">odl-restconf</feature>        -->
         <bundle>mvn:org.opendaylight.sfc/sfc-netconf/${project.version}</bundle>
diff --git a/features/pom.xml b/features/pom.xml
index e32f13d41..10e3a37f9 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -44,13 +44,14 @@
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
+      <groupId>org.opendaylight.netconf</groupId>
       <artifactId>features-restconf</artifactId>
+      <version>${restconf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
+      <groupId>org.opendaylight.netconf</groupId>
       <artifactId>features-netconf-connector</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
@@ -76,6 +77,11 @@
       Put dependencies for bundles directly referenced in your features.xml file.
       For every <bundle> reference in your features.xml file, you need a corresponding dependency here.
     -->
+   <dependency>
+       <groupId>org.opendaylight.netconf</groupId>
+       <artifactId>sal-rest-docgen</artifactId>
+       <version>${restconf.version}</version>
+   </dependency>
 
     <!--
       Put dependencies for configfiles directly referenced in your features.xml file.
diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index a7dc7eb64..bd719c777 100644
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -16,7 +16,7 @@
 
     <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-restconf/${mdsal.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
     <!--<repository>mvn:org.opendaylight.controller/features-config/${config.version}/xml/features</repository>-->
     <repository>mvn:org.opendaylight.ovsdb/southbound-features/${ovsdb.southbound.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.l2switch/features-l2switch/${l2switch.version}/xml/features</repository>
@@ -56,7 +56,7 @@
     -->
     <feature name='odl-sfc-ui' version='${project.version}' description='OpenDaylight :: sfc :: UI'>
         <feature version='${project.version}'>odl-sfc-provider-rest</feature>
-        <feature version='${mdsal.version}'>odl-mdsal-apidocs</feature>
+        <feature version='${restconf.version}'>odl-mdsal-apidocs</feature>
         <!--<feature version="${mdsal.version}">odl-restconf</feature>-->
         <feature>http</feature>
         <!--<feature version='${webconsole.version}'>webconsole</feature>-->
@@ -98,7 +98,7 @@
 
     <feature name='odl-sfc-provider-rest' version='${project.version}' description='OpenDaylight :: sfc :: Provider '>
       <feature version='${project.version}'>odl-sfc-provider</feature>
-      <feature version="${mdsal.version}">odl-restconf</feature>
+      <feature version="${restconf.version}">odl-restconf</feature>
     </feature>
 
     <feature name='odl-sfc-test-consumer' version='${project.version}' description='OpenDaylight :: sfc :: Test :: Consumer '>
diff --git a/pom.xml b/pom.xml
index 371f264ed..b470b4250 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,8 @@
         <config.version>0.4.0-SNAPSHOT</config.version>
         <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
         <build.helper.version>1.8</build.helper.version>
-        <netconf.parent.version>0.4.0-SNAPSHOT</netconf.parent.version>
+        <netconf.parent.version>1.0.0-SNAPSHOT</netconf.parent.version>
+        <restconf.version>1.3.0-SNAPSHOT</restconf.version>
         <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
         <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
 
@@ -100,7 +101,14 @@
                 <type>pom</type>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller</groupId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>restconf-artifacts</artifactId>
+                <version>${restconf.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>netconf-artifacts</artifactId>
                 <version>${netconf.parent.version}</version>
                 <scope>import</scope>
diff --git a/sfc-netconf/pom.xml b/sfc-netconf/pom.xml
index 252913d4c..a1dff2537 100755
--- a/sfc-netconf/pom.xml
+++ b/sfc-netconf/pom.xml
@@ -148,7 +148,7 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>sal-netconf-connector</artifactId>
         </dependency>
         <dependency>
diff --git a/sfc-provider/pom.xml b/sfc-provider/pom.xml
index 3e0b1dc05..4038268b2 100755
--- a/sfc-provider/pom.xml
+++ b/sfc-provider/pom.xml
@@ -28,7 +28,7 @@
             <artifactId>config-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>sal-netconf-connector</artifactId>
         </dependency>
         <dependency>