From: Tony Tkacik <ttkacik@cisco.com>
Date: Thu, 6 Nov 2014 11:41:44 +0000 (+0100)
Subject: Quickfix: Changed used feature to odl-aaa-netconf-plugin
X-Git-Tag: release/lithium~876^2~2^2~3
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=def3ed5d503108b48ad3e90e451e20b72b5dbd72

Quickfix: Changed used feature to odl-aaa-netconf-plugin

AAA project renamed their netconf related feature without
introducing proper patchset into controller. This fixes
features.xml to reference properly new feature.

Change-Id: Ic0d512804a87f20f058462541cd061f83a8f52e7
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
---

diff --git a/features/netconf-connector/src/main/resources/features.xml b/features/netconf-connector/src/main/resources/features.xml
index 6ae308eb0c..614c9d013a 100644
--- a/features/netconf-connector/src/main/resources/features.xml
+++ b/features/netconf-connector/src/main/resources/features.xml
@@ -25,6 +25,9 @@
     <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-netconf/${netconf.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>
     <feature name='odl-netconf-connector-all' version='${project.version}' description='OpenDaylight :: Netconf Connector :: All'>
         <!--
@@ -100,7 +103,10 @@
     </feature>
     <feature name='odl-netconf-ssh' version='${netconf.version}' description="OpenDaylight :: Netconf Connector :: SSH">
         <feature version='${netconf.version}'>odl-netconf-tcp</feature>
-        <feature version='${aaa.version}'>odl-aaa-authn-plugin</feature>
+        <!-- FIXME: This introduces cycle between projects, which makes version updates
+                    harder. Should be moved to different.
+        -->
+        <feature version='${aaa.version}'>odl-aaa-netconf-plugin</feature>
         <bundle>mvn:org.opendaylight.controller/netconf-ssh/${netconf.version}</bundle>
         <bundle>mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}</bundle>
         <bundle>mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle.version}</bundle>