Add missing NETCONF features to distribution

This is a follow-up patch to
https://git.opendaylight.org/gerrit/#/c/59607/. This adds missing
NETCONF features to integration/distribution.

Change-Id: Id74d9fa0a7b991251bc9eba60af494bdd7df7052
Signed-off-by: Jakub Morvay <jmorvay@cisco.com>

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index 464df5b84da9cc2071e1998b7c6423e03c210729..bade61f171ebb1cdc38778fc7eb18c15e644113f 100644 (file)
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -84,6 +84,20 @@
             <classifier>features</classifier>
         </dependency>
 
+        <!-- Netconf -->
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-topology</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-clustered-topology</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
         <!-- Netvirt -->
         <dependency>
             <groupId>org.opendaylight.netvirt</groupId>

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 3aebfd716b0c3daf634f4baa51fea3139376e3b6..d13899e05d17fe19cae44d59a6ff933584e5a539 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -160,14 +160,12 @@
         </dependency>
 
         <!-- Netconf -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=7891
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-mdsal</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-mdsal-apidocs</artifactId>