Get rid of odl-netconf-connector-ssh feature

The feature is historically linked with config-subsystem northbound
endpoint and loopback connection to this endpoint. It has been
deprecated for a while and now it just wraps odl-netconf-topology
feature.

Delete this feature as it does not provide any added value over
using odl-netconf-topology feature directly.

Change-Id: Iaabe2fc4dc2be797531fb2898f2042c38a077c76
Signed-off-by: Jakub Morvay <jmorvay@frinx.io>

diff --git a/features/netconf-connector/features-netconf-connector/pom.xml b/features/netconf-connector/features-netconf-connector/pom.xml
index e442f15beaadb8695bd9c88ac19b773c762b916b..e3b42c9b92cee34cf4929df6847cce9f9aa119c0 100644 (file)
--- a/features/netconf-connector/features-netconf-connector/pom.xml
+++ b/features/netconf-connector/features-netconf-connector/pom.xml
@@ -56,13 +56,6 @@
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-netconf-connector-ssh</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-netconf-callhome-ssh</artifactId>

diff --git a/features/netconf-connector/odl-netconf-connector-all/pom.xml b/features/netconf-connector/odl-netconf-connector-all/pom.xml
index 666a0172e0b784bdef461ccbde90d48bbfa04ebf..656fce9396879e0a77874999cbeb648e0c394162 100644 (file)
--- a/features/netconf-connector/odl-netconf-connector-all/pom.xml
+++ b/features/netconf-connector/odl-netconf-connector-all/pom.xml
@@ -31,13 +31,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-netconf-connector-ssh</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-netconf-callhome-ssh</artifactId>

diff --git a/features/netconf-connector/odl-netconf-connector-ssh/pom.xml b/features/netconf-connector/odl-netconf-connector-ssh/pom.xml
deleted file mode 100644 (file)
index 5ac4d7a..0000000
--- a/features/netconf-connector/odl-netconf-connector-ssh/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>odl-netconf-connector-ssh</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>!!!DEPRECATED!!! OpenDaylight :: Netconf Connector :: Netconf Connector + Netconf SSH Server</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-netconf-topology</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-    </dependencies>
-</project>

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index f2b82d4858be27ebe8a39a9445c39a221d1a361c..d2936e6980625a406f55f24c71e69e2a6cf5bbf4 100644 (file)
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -33,7 +33,6 @@
         <module>odl-netconf-clustered-topology</module>
         <module>odl-netconf-connector</module>
         <module>odl-netconf-connector-all</module>
-        <module>odl-netconf-connector-ssh</module>
         <module>odl-netconf-callhome-ssh</module>
         <module>odl-netconf-console</module>
         <module>odl-netconf-topology</module>