From 27a8264015c1da21f27e8d6e19376a929666901b Mon Sep 17 00:00:00 2001
From: Stephen Kitt <skitt@redhat.com>
Date: Tue, 14 Feb 2017 16:27:18 +0100
Subject: [PATCH] Declare -util/-tcp/-ssh prerequisites

This is imperfect since we drop the relationships from the POMs, which
breaks -Psft (running SFT on the features individually). We need to
improve the plugin to handle this more generically.

Change-Id: Ic7ddc583450b3e207eb4a13f837e8994cb3d5ff0
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
---
 features/netconf/odl-netconf-ssh/pom.xml           |  2 ++
 .../odl-netconf-ssh/src/main/feature/feature.xml   | 14 ++++++++++++++
 features/netconf/odl-netconf-tcp/pom.xml           |  2 ++
 .../odl-netconf-tcp/src/main/feature/feature.xml   | 13 +++++++++++++
 netconf/netconf-topology-singleton/pom.xml         |  4 ----
 5 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 features/netconf/odl-netconf-ssh/src/main/feature/feature.xml
 create mode 100644 features/netconf/odl-netconf-tcp/src/main/feature/feature.xml

diff --git a/features/netconf/odl-netconf-ssh/pom.xml b/features/netconf/odl-netconf-ssh/pom.xml
index c0fff3f470..93b3f7c641 100644
--- a/features/netconf/odl-netconf-ssh/pom.xml
+++ b/features/netconf/odl-netconf-ssh/pom.xml
@@ -26,6 +26,7 @@
     <name>OpenDaylight :: Netconf Connector :: SSH</name>
 
     <dependencies>
+        <!-- These are pulled in via feature.xml directly for now (until we can configure prerequisites here
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-netconf-util</artifactId>
@@ -40,6 +41,7 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-aaa-netconf-plugin</artifactId>
diff --git a/features/netconf/odl-netconf-ssh/src/main/feature/feature.xml b/features/netconf/odl-netconf-ssh/src/main/feature/feature.xml
new file mode 100644
index 0000000000..262012a215
--- /dev/null
+++ b/features/netconf/odl-netconf-ssh/src/main/feature/feature.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, Inc. and others.
+
+ 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-ssh" version="${project.version}">
+        <feature version="1.2.0.SNAPSHOT" prerequisite="true">odl-netconf-tcp</feature>
+        <feature version="1.2.0.SNAPSHOT" prerequisite="true">odl-netconf-util</feature>
+    </feature>
+</features>
diff --git a/features/netconf/odl-netconf-tcp/pom.xml b/features/netconf/odl-netconf-tcp/pom.xml
index 319ea71d7e..f319749c39 100644
--- a/features/netconf/odl-netconf-tcp/pom.xml
+++ b/features/netconf/odl-netconf-tcp/pom.xml
@@ -26,6 +26,7 @@
     <name>OpenDaylight :: Netconf Connector :: TCP</name>
 
     <dependencies>
+        <!-- This is pulled in via feature.xml directly for now (until we can configure prerequisites here
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-netconf-util</artifactId>
@@ -33,6 +34,7 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-netconf-impl</artifactId>
diff --git a/features/netconf/odl-netconf-tcp/src/main/feature/feature.xml b/features/netconf/odl-netconf-tcp/src/main/feature/feature.xml
new file mode 100644
index 0000000000..1bb5b4672f
--- /dev/null
+++ b/features/netconf/odl-netconf-tcp/src/main/feature/feature.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, Inc. and others.
+
+ 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-tcp" version="${project.version}">
+        <feature version="1.2.0.SNAPSHOT" prerequisite="true">odl-netconf-util</feature>
+    </feature>
+</features>
diff --git a/netconf/netconf-topology-singleton/pom.xml b/netconf/netconf-topology-singleton/pom.xml
index 25166bd8f2..95a546a9f2 100644
--- a/netconf/netconf-topology-singleton/pom.xml
+++ b/netconf/netconf-topology-singleton/pom.xml
@@ -44,10 +44,6 @@
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>mdsal-netconf-notification</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-topology</artifactId>
-- 
2.36.6