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>

diff --git a/features/netconf/odl-netconf-ssh/pom.xml b/features/netconf/odl-netconf-ssh/pom.xml
index c0fff3f47008f035dde714a9a031fc815c12be5b..93b3f7c64139c698d445419c04b4ae7d24a43d86 100644 (file)
--- 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 (file)
index 0000000..262012a
--- /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 319ea71d7e458d033c3ef8165e514275f9083bea..f319749c3928fabd9c05b31503f0362968ebe5ce 100644 (file)
--- 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 (file)
index 0000000..1bb5b46
--- /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 25166bd8f2316dc55b1566d11cab9b0104b43ac8..95a546a9f26a6d6ff0a3da08aba1fae5d1aef80e 100644 (file)
--- 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>