Bug 1731: Breaking dependency cycle between features-{mdsal,aaa}

This is the follow up to integration for:
https://git.opendaylight.org/gerrit/#/c/10878/

Change-Id: I89fa9d92641886d552eeeb39f7252946ddb2b3e6
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/features/pom.xml b/features/pom.xml
index c8cad3ddbdca3fd7b322c6b0ef0f3ed32df63d7b..9ff83f188276ac98e3561b87887bca140213ec2e 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -30,6 +30,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-netconf-connector</artifactId>
+      <version>${feature.mdsal.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-adsal</artifactId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 345ec8ef543d6ffc0befb2d43d6b7aa0164f109c..bd072cb41435788c22cd6e2673b822660c875714 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -55,6 +55,7 @@
     <repository>mvn:org.opendaylight.controller/features-adsal/${feature.adsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-adsal-compatibility/1.4.2-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/${feature.mdsal.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-netconf-connector/${feature.mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-nsf/${feature.nsf.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.dlux/features-dlux/${feature.dlux.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.groupbasedpolicy/features-groupbasedpolicy/${feature.groupbasedpolicy.version}/xml/features</repository>
@@ -72,6 +73,7 @@
 
     <feature name='odl-integration-compatible-with-all' version='${project.version}'>
         <feature version='1.1-SNAPSHOT'>odl-mdsal-broker</feature>
+        <feature version='${feature.mdsal.version}'>odl-netconf-connector-ssh</feature>
         <feature version='1.1-SNAPSHOT'>odl-restconf</feature>
         <feature version='${feature.adsal.version}'>odl-adsal-all</feature>
         <feature version='${feature.nsf.version}'>odl-nsf-all</feature>