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

diff --git a/features/restconf/odl-restconf-nb-rfc8040/pom.xml b/features/restconf/odl-restconf-nb-rfc8040/pom.xml
index ac477a8c2ed984d20c7c90f23a91eff420c8f4b9..8c17cf9d22f78561fad9492831b7b6f192b89a69 100644 (file)
--- 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 14127b600f3b3bf4bf27f75085bf0dd0208255cd..194a6d6b89c2285e634073d86a2ea9a656844985 100644 (file)
--- 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>