From: Ryan Goulding <ryandgoulding@gmail.com>
Date: Sun, 25 Mar 2018 22:22:55 +0000 (-0400)
Subject: Depend on odl-aaa-shiro-act feature instead of bundle
X-Git-Tag: release/fluorine~120^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=071278f2b8178f9e021ee1e5e79af433238c6756;p=netconf.git

Depend on odl-aaa-shiro-act feature instead of bundle

This is related to AAA-164, which involves exposing a feature for
AAA activation instead of a bundle.

JIRA: AAA-164
Change-Id: I032e7dc8afef4b053d2162194454cde73cf85f45
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
---

diff --git a/features/restconf/odl-restconf-nb-rfc8040/pom.xml b/features/restconf/odl-restconf-nb-rfc8040/pom.xml
index ac477a8c2e..8c17cf9d22 100644
--- a/features/restconf/odl-restconf-nb-rfc8040/pom.xml
+++ b/features/restconf/odl-restconf-nb-rfc8040/pom.xml
@@ -25,13 +25,14 @@
 
     <name>OpenDaylight :: Restconf NB - RFC8040</name>
 
-    <!-- Enables AAA through the odl-shiro-act bundle Activator -->
-
     <dependencies>
+        <!-- Enables AAA through aaa-shiro-act -->
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>aaa-shiro-act</artifactId>
+            <artifactId>odl-aaa-shiro-act</artifactId>
             <version>0.8.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
diff --git a/features/restconf/odl-restconf/pom.xml b/features/restconf/odl-restconf/pom.xml
index 14127b600f..194a6d6b89 100644
--- a/features/restconf/odl-restconf/pom.xml
+++ b/features/restconf/odl-restconf/pom.xml
@@ -25,13 +25,14 @@
 
     <name>OpenDaylight :: Restconf</name>
 
-    <!-- Enables AAA through the odl-shiro-act bundle Activator -->
-
     <dependencies>
+        <!-- Enables AAA through aaa-shiro-act -->
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>aaa-shiro-act</artifactId>
+            <artifactId>odl-aaa-shiro-act</artifactId>
             <version>0.8.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>