Bug 6358 - Fix merge parents

[netconf.git] / karaf / pom.xml

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 93332aabc4b129434acf01bf7451bcf0714bbcfe..18710a6c647e3ebcb137ad248f9e7ba8cda81246 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -10,19 +10,19 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>karaf-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <relativePath></relativePath>
   </parent>
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-karaf</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <prerequisites>
     <maven>3.1.1</maven>
   </prerequisites>
   <properties>
-    <netconf.version>1.0.0-SNAPSHOT</netconf.version>
-    <restconf.version>1.3.0-SNAPSHOT</restconf.version>
+    <netconf.version>1.1.0-SNAPSHOT</netconf.version>
+    <restconf.version>1.4.0-SNAPSHOT</restconf.version>
   </properties>
 
   <dependencies>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>features-netconf-connector</artifactId>
-      <version>${restconf.version}</version>
+      <version>${netconf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
@@ -57,6 +57,14 @@
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>features-yanglib</artifactId>
+      <version>${netconf.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
 
   <build>