Add NETCONF to integration/distribution

This adds NETCONF project top-level to integration/distribution.

Change-Id: I43727b3fab0e7068f6a69f12b4ca86f1b6412dcd
Signed-off-by: Jakub Morvay <jmorvay@cisco.com>
Signed-off-by: Andrej Kilvady <akilvady@cisco.com>

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index 43801e3d0faafd6862a748ba1adf51318d9c09b1..dffb94feecc15ba4c3c11f5a37d71872e40db6fc 100644 (file)
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -146,6 +146,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>netconf-artifacts</artifactId>
+                <version>${netconf.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index 6ccf87a844b6010ac10c8ae317a9fa3e94799da0..935e7b1388b46bd886354b48f667d303feb44dbd 100644 (file)
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -109,21 +109,6 @@
                 <type>xml</type>
             </dependency>
 
-            <!-- Netconf -->
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>features-netconf-connector</artifactId>
-                <version>${netconf.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>features-restconf</artifactId>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
             <!-- ODL Parent -->
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>

diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index 77c0dbf68c957f7059a22e7083b05b8bcf214cb2..c3bdd356109e9a94649b38680c19bdfc8cb27a19 100644 (file)
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -87,21 +87,6 @@
                 <classifier>features</classifier>
             </dependency>
 
-            <!-- Netconf -->
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>odl-netconf-mdsal</artifactId>
-                <version>${mdsal.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>odl-restconf</artifactId>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
             <!-- SXP -->
             <dependency>
                 <groupId>org.opendaylight.sxp</groupId>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 23bea4bdbcf037d29e47eb019ebfdbb44a3ed6c1..64a74eccd0ff96383ce87c873119650f831b6a93 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -188,7 +188,6 @@
         </dependency>
 
         <!-- Netconf -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=7891
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>features-netconf</artifactId>
@@ -201,13 +200,18 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>features-restconf</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>features-yanglib</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
 
         <!-- Netvirt -->
         <dependency>

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 415945f8904f14326a0583f9e92a6749358c12c9..1e06266d36828d598f7fa43208228decd91c52ad 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -148,11 +148,35 @@
             <classifier>features</classifier>
         </dependency>
         -->
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-mdsal-apidocs</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-callhome-ssh</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-console</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-restconf</artifactId>
+            <classifier>features</classifier>
             <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-yanglib</artifactId>
             <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
 
         <!-- Neutron Northbound -->