hwvtepsb: Fixed restconf migration build issues

restconf migration from controller to netconf was done while
hwvtep bundle creation was in progress, so those were not done
for hwvtepsouthbound which is causing build failure.

Change-Id: Ib32c591e0dd197730f1bc50d7e92b38018c0fd7f
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml
index 556dcd39620ba3f01b967be76cf2e21b8691cc2d..e50de3a49d2b54ebd3cad5da057fceb6a631f3ba 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-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.3.0-SNAPSHOT</mdsal.version>
+    <restconf.version>1.3.0-SNAPSHOT</restconf.version>
     <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
     <dlux.version>0.3.0-SNAPSHOT</dlux.version>
     <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
@@ -37,6 +38,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>restconf-artifacts</artifactId>
+        <version>${restconf.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <dependencies>
@@ -65,10 +73,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
+      <groupId>org.opendaylight.netconf</groupId>
       <artifactId>features-restconf</artifactId>
       <classifier>features</classifier>
-      <version>${mdsal.version}</version>
+      <version>${restconf.version}</version>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/src/main/features/features.xml b/hwvtepsouthbound/hwvtepsouthbound-features/src/main/features/features.xml
index fc4db1ce37d29f3f86a52a3abf166f20aa942386..967a07c36ae80b821bfa68097e494519d100e769 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/src/main/features/features.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/src/main/features/features.xml
@@ -12,7 +12,7 @@ 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-restconf/${mdsal.version}/xml/features</repository>
+  <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository>
   <feature name='odl-ovsdb-hwvtepsouthbound-api' version='${project.version}' description='OpenDaylight :: hwvtepsouthbound :: api'>

diff --git a/hwvtepsouthbound/pom.xml b/hwvtepsouthbound/pom.xml
index 5ee5ebde84a395060a546a5f75133509cdb596ca..a4b145f73d5b46b865111c261d0ec4e872811a75 100644 (file)
--- a/hwvtepsouthbound/pom.xml
+++ b/hwvtepsouthbound/pom.xml
@@ -26,9 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <modules>
     <module>hwvtepsouthbound-api</module>
     <module>hwvtepsouthbound-impl</module>
-    <!-- 
     <module>hwvtepsouthbound-karaf</module>
-     -->
     <module>hwvtepsouthbound-features</module>
     <module>hwvtepsouthbound-artifacts</module>
     <!--