Bug 5638 switch netconf to use odl-aaa-shiro isntead of odl-aaa-authn

odl-aaa-authn has very limited uses now, since odl-aaa-shiro has
included most of its features by default.  Switch netconf to use
odl-aaa-shiro instead of odl-aaa-authn, to get most up to date
aaa implementation.  odl-aaa-authn should be deprecated in a
separate patch.

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

diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index 5c570a3785eb2bb32d50dbe4c26f9ccc2333748c..f9ece05658d6b80fa73b54afe6837122002b01aa 100644 (file)
--- a/features/netconf/pom.xml
+++ b/features/netconf/pom.xml
@@ -119,12 +119,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.aaa</groupId>
-      <artifactId>features-aaa</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
       <artifactId>features-aaa-shiro</artifactId>

diff --git a/features/netconf/src/main/features/features.xml b/features/netconf/src/main/features/features.xml
index 0f96d915952159c2fb8a2a94cd21ad1c3e267e95..e9bcac1242c86d89e2e2bf8e84098987497c22ce 100644 (file)
--- a/features/netconf/src/main/features/features.xml
+++ b/features/netconf/src/main/features/features.xml
@@ -8,10 +8,7 @@
   <repository>mvn:org.opendaylight.controller/features-config/{{VERSION}}/xml/features</repository>
   <repository>mvn:org.opendaylight.controller/features-config-persister/{{VERSION}}/xml/features</repository>
   <repository>mvn:org.opendaylight.controller/features-config-netty/{{VERSION}}/xml/features</repository>
-  <!-- FIXME: This introduces cycle between projects, which makes version updates
-              harder. Should be moved to different.
-      -->
-  <repository>mvn:org.opendaylight.aaa/features-aaa/${aaa.version}/xml/features</repository>
+  <repository>mvn:org.opendaylight.aaa/features-aaa-shiro/${aaa.version}/xml/features</repository>
 
   <feature name='odl-netconf-all' version='${project.version}' description="OpenDaylight :: Netconf :: All">
     <feature version='${project.version}'>odl-netconf-api</feature>
@@ -147,7 +144,7 @@
            version='${project.version}'>
     <feature version='${config.version}'>odl-config-api</feature>
     <bundle>mvn:org.opendaylight.netconf/netconf-auth/{{VERSION}}</bundle>
-    <feature version='${aaa.version}'>odl-aaa-authn</feature>
+    <feature version='${aaa.version}'>odl-aaa-shiro</feature>
     <bundle>mvn:org.opendaylight.netconf/aaa-authn-odl-plugin/{{VERSION}}</bundle>
   </feature>
 
@@ -156,7 +153,7 @@
            version='${project.version}'>
     <feature version='${config.version}'>odl-config-api</feature>
     <bundle>mvn:org.opendaylight.netconf/netconf-auth/{{VERSION}}</bundle>
-    <feature version='${aaa.version}'>odl-aaa-authn-no-cluster</feature>
+    <feature version='${aaa.version}'>odl-aaa-shiro</feature>
     <bundle>mvn:org.opendaylight.netconf/aaa-authn-odl-plugin/{{VERSION}}</bundle>
   </feature>
 </features>