React to changes in AAA feature structure

Change-Id: Ib727e3e88a78c99c44c911c8781622051af7785c
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 0fdadb73691999cdc42955160340ed01ba995050..a88a94e437e096c33e93fd60eb7d2e498b97e741 100644 (file)
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -46,13 +46,6 @@
             <type>xml</type>
         </dependency>
         <!-- feature repository dependencies from other ODL projects -->
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>features-aaa-api</artifactId>
-            <version>${feature.aaa.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>features-aaa</artifactId>
@@ -62,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>features-aaa-authz</artifactId>
+            <artifactId>features-aaa-shiro</artifactId>
             <version>${feature.aaa.version}</version>
             <classifier>features</classifier>
             <type>xml</type>

diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index fe372f8b182478d63ca6ac5cc4a2141ed8a68d57..9daf94fd0aaf0a4f91d47e16651349d2c2115634 100644 (file)
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -31,8 +31,7 @@
 
     <!-- Please add new repository in an alphabetical order -->
     <repository>mvn:org.opendaylight.aaa/features-aaa/${feature.aaa.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.aaa/features-aaa-api/${feature.aaa.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.aaa/features-aaa-authz/${feature.aaa.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.aaa/features-aaa-shiro/${feature.aaa.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.alto/features-alto-release/${feature.alto.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.atrium/atrium-features/${feature.atrium.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-bgp/${feature.bgpcep.version}/xml/features</repository>

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index d33b2b48e45dab1164331dd20e3f3f1065f33061..5a93c4cda8a5cf42b881c10e2009c427d2250330 100644 (file)
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -57,9 +57,9 @@
 
     <!-- Please use alphabetical order to add a compatible with all features -->
     <feature name='odl-integration-compatible-with-all' version='${project.version}'>
-        <feature version='${feature.aaa.version}'>odl-aaa-api</feature>
         <feature version='${feature.aaa.version}'>odl-aaa-authn</feature>
         <feature version='${feature.aaa.version}'>odl-aaa-authz</feature>
+        <feature version='${feature.aaa.version}'>odl-aaa-shiro</feature>
         <feature version='${feature.netconf.version}'>odl-aaa-netconf-plugin</feature>
         <feature version='${feature.aaa.version}'>odl-aaa-sssd-plugin</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-bgp-all</feature>