Migrate to karaf4 for the local karaf distribution

Several folks have put in incredible effort to make karaf4 a reality in ODL.
Kudos to those folks for this great effort.  This patch officially converts
netconf's local karaf distribution to use odlparent's karaf4-parent artifact.

The karaf4 implementation will still be accessible at the following well-known
path:

> karaf/target/assembly

Change-Id: I00a1e5b93f5c57447e95a714d40e0635b5747393
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 9046c16d8634c6b596ce2855cc1b81547227f3a5..65a37b10a8b551cf4b1bfcd738977909551ce93a 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -10,9 +10,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>karaf-parent</artifactId>
+    <artifactId>karaf4-parent</artifactId>
     <version>1.9.0-SNAPSHOT</version>
-    <relativePath></relativePath>
+    <relativePath/>
   </parent>
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-karaf</artifactId>
@@ -36,7 +36,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>
@@ -44,7 +44,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-netconf-connector</artifactId>
+      <artifactId>features4-netconf-connector</artifactId>
       <version>${netconf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
@@ -52,7 +52,7 @@
     </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>
@@ -60,7 +60,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-yanglib</artifactId>
+      <artifactId>features4-yanglib</artifactId>
       <version>${netconf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>