From 211a9797a7cdbdec317d76431b8d691ca268aafd Mon Sep 17 00:00:00 2001
From: Andrej Mak <andrej.mak@pantheon.tech>
Date: Wed, 3 May 2017 09:06:48 +0200
Subject: [PATCH] Bug 7891: Add ssh feature to netconf-netty-util

Odl-netconf-netty-util needs sshd-core bunde to work.
It is provided by karaf. However, if odl-netconf-netty-util
is placed to featuresBoot, ssh provided by karaf isn't
started, so ResolutionException is thrown. To prevent this
add ssh feature to odl-netconf-netty-util.

Change-Id: Iaf5ecddaa726ea892191b5cf47095c1df3b096f6
Signed-off-by: Andrej Mak <andrej.mak@pantheon.tech>
---
 features/netconf/odl-netconf-netty-util/pom.xml     |  8 ++++++++
 .../src/main/feature/feature.xml                    | 13 +++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 features/netconf/odl-netconf-netty-util/src/main/feature/feature.xml

diff --git a/features/netconf/odl-netconf-netty-util/pom.xml b/features/netconf/odl-netconf-netty-util/pom.xml
index 26e63eedcd..2236c680f2 100644
--- a/features/netconf/odl-netconf-netty-util/pom.xml
+++ b/features/netconf/odl-netconf-netty-util/pom.xml
@@ -26,6 +26,14 @@
     <name>OpenDaylight :: Netconf :: Netty Util</name>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <version>${karaf4.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-netconf-api</artifactId>
diff --git a/features/netconf/odl-netconf-netty-util/src/main/feature/feature.xml b/features/netconf/odl-netconf-netty-util/src/main/feature/feature.xml
new file mode 100644
index 0000000000..4607798ac8
--- /dev/null
+++ b/features/netconf/odl-netconf-netty-util/src/main/feature/feature.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
+  ~
+  ~ This program and the accompanying materials are made available under the
+  ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+  ~ and is available at http://www.eclipse.org/legal/epl-v10.html
+  -->
+<features name="odl-netconf-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+    <feature name="odl-netconf-netty-util" version="${project.version}">
+        <feature version="${karaf4.version}">ssh</feature>
+    </feature>
+</features>
-- 
2.36.6