From 5a088960da6dbd581e083ecce02c4f189aa35f20 Mon Sep 17 00:00:00 2001
From: Ryan Goulding <ryandgoulding@gmail.com>
Date: Wed, 31 May 2017 15:11:18 -0400
Subject: [PATCH] Move local karaf distribution to karaf4

Move the local karaf distribution to karaf4.  Also adds a
missing artifact to the artifacts pom.

Change-Id: I881794d3d3cdc22ed9776f87480b8c9437434e71
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
---
 artifacts/pom.xml | 7 +++++++
 karaf/pom.xml     | 8 +++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 1a782d538..4e3117ea5 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -122,6 +122,13 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>features4-aaa-authn</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>aaa-h2-store</artifactId>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 0a8ba2bb0..bad48002c 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -12,7 +12,7 @@
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>karaf-parent</artifactId>
+        <artifactId>karaf4-parent</artifactId>
         <version>1.9.0</version>
         <relativePath></relativePath>
     </parent>
@@ -46,14 +46,16 @@
         <!-- Project local feautures -->
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>features-aaa</artifactId>
+            <artifactId>features4-aaa</artifactId>
+            <version>${project.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>features-aaa-shiro</artifactId>
+            <artifactId>features4-aaa-shiro</artifactId>
+            <version>${project.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>
-- 
2.36.6