Merge "Add JSONRestconfService impl for the restconf Draft18 impl"

[netconf.git] / karaf / pom.xml

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 3ab1d1478ed79c3ee70520c4ee63ccca9f651666..fc61081e12544ed433705caa6bbbaba2e2dc386d 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -11,16 +11,13 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>1.9.0</version>
+    <version>2.0.2</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-karaf</artifactId>
   <version>1.6.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <properties>
     <netconf.version>1.3.0-SNAPSHOT</netconf.version>
     <restconf.version>1.6.0-SNAPSHOT</restconf.version>
@@ -36,7 +33,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features4-netconf</artifactId>
+      <artifactId>features-netconf</artifactId>
       <version>${netconf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
@@ -44,7 +41,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features4-netconf-connector</artifactId>
+      <artifactId>features-netconf-connector</artifactId>
       <version>${netconf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
@@ -52,7 +49,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features4-restconf</artifactId>
+      <artifactId>features-restconf</artifactId>
       <version>${restconf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
@@ -60,7 +57,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features4-yanglib</artifactId>
+      <artifactId>features-yanglib</artifactId>
       <version>${netconf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>