From: Ryan Goulding <ryandgoulding@gmail.com>
Date: Thu, 23 Mar 2017 11:12:01 +0000 (+0000)
Subject: Revert "Migrate to karaf4 for the local karaf distribution"
X-Git-Tag: release/carbon~17^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=4722f5b373f7aa66a0d82c158a3f240c6e8e2293;p=aaa.git

Revert "Migrate to karaf4 for the local karaf distribution"

This reverts commit fbfe065aa9fdbcd67eb71e913421db4c749683e4.


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

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 7bdc2e7a1..db65fb4b8 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -12,7 +12,7 @@
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>karaf4-parent</artifactId>
+        <artifactId>karaf-parent</artifactId>
         <version>1.8.0-SNAPSHOT</version>
         <relativePath></relativePath>
     </parent>