X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=karaf%2Fpom.xml;h=03a12aa66444c308332f0e7411bba1435bfc6e81;hb=3d7090c8bf0df8c9814b7d3cb2c43dff483a5c7a;hp=93332aabc4b129434acf01bf7451bcf0714bbcfe;hpb=67fdb8ee69f1b17ec8cd44633b4df7bce99079bf;p=netconf.git

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 93332aabc4..03a12aa664 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -1,28 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <!--
-    Necessary TODO: Hookup your parent pom here, else you will not get necessary versions,
-    maven repos etc.  If you run this archetype in a subdirectory of your project, it
-    will pick the pom.xml from the parent directory as the parent pom, which may or may
-    not be correct.
-  -->
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>karaf-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath></relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>karaf4-parent</artifactId>
+    <version>2.0.0</version>
+    <relativePath/>
   </parent>
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-karaf</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.6.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.3.0-SNAPSHOT</netconf.version>
+    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
   </properties>
 
   <dependencies>
@@ -35,7 +33,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-netconf</artifactId>
+      <artifactId>features4-netconf</artifactId>
       <version>${netconf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
@@ -43,20 +41,28 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-netconf-connector</artifactId>
-      <version>${restconf.version}</version>
+      <artifactId>features4-netconf-connector</artifactId>
+      <version>${netconf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-restconf</artifactId>
+      <artifactId>features4-restconf</artifactId>
       <version>${restconf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>features4-yanglib</artifactId>
+      <version>${netconf.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
 
   <build>