From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 7 Jul 2020 16:46:41 +0000 (+0200)
Subject: Bump mina-sshd to 2.5.1
X-Git-Tag: release/sodium-sr4~6
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=7d79923bd5d06421d059493424111393e046e980;p=netconf.git

Bump mina-sshd to 2.5.1

https://github.com/apache/mina-sshd/blob/master/docs/changes/2.5.0.md
https://github.com/apache/mina-sshd/blob/master/docs/changes/2.5.1.md

Change-Id: I95b25909fad428a3ba61472cedc7d98c3ebe1532
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit c2e07b76734c34a2fe88262530b4ac4a387b8ee7)
---

diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/NetconfSshClient.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/NetconfSshClient.java
index 7b5308a36f..d5d0d97aa9 100644
--- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/NetconfSshClient.java
+++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/NetconfSshClient.java
@@ -10,8 +10,6 @@ package org.opendaylight.netconf.nettyutil.handler.ssh.client;
 import com.google.common.annotations.Beta;
 import org.opendaylight.netconf.shaded.sshd.client.SshClient;
 import org.opendaylight.netconf.shaded.sshd.common.Factory;
-import org.opendaylight.netconf.shaded.sshd.common.forward.PortForwardingEventListener;
-import org.opendaylight.netconf.shaded.sshd.common.util.net.SshdSocketAddress;
 
 /**
  * An extension to {@link SshClient} which uses {@link NetconfSessionFactory} to create sessions (leading towards
@@ -21,22 +19,6 @@ import org.opendaylight.netconf.shaded.sshd.common.util.net.SshdSocketAddress;
 public class NetconfSshClient extends SshClient {
     public static final Factory<SshClient> DEFAULT_NETCONF_SSH_CLIENT_FACTORY = NetconfSshClient::new;
 
-    /*
-     * This is a workaround for sshd-core's instantiation of Proxies. AbstractFactoryManager (which is our superclass)
-     * is calling Proxy.newProxyInstance() with getClass().getClassLoader(), i.e. our class loader.
-     *
-     * Since we are not using PortForwardingEventListener, our classloader does not see it (because we do not import
-     * that package), which leads to an instantiation failure.
-     *
-     * Having these dumb fields alleviates the problem, as it forces the packages to be imported by our bundle.
-     *
-     * FIXME: Remove this once we have an SSHD version with  https://issues.apache.org/jira/browse/SSHD-975 fixed
-     */
-    static final class Sshd975Workarounds {
-        static final PortForwardingEventListener PFEL = null;
-        static final SshdSocketAddress SSA = null;
-    }
-
     @Override
     protected NetconfSessionFactory createSessionFactory() {
         return new NetconfSessionFactory(this);
diff --git a/netconf/shaded-sshd-jar/pom.xml b/netconf/shaded-sshd-jar/pom.xml
index 5c6fc2dfd9..5530cd12ea 100644
--- a/netconf/shaded-sshd-jar/pom.xml
+++ b/netconf/shaded-sshd-jar/pom.xml
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-osgi</artifactId>
-            <version>2.4.0</version>
+            <version>2.5.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-netty</artifactId>
-            <version>2.4.0</version>
+            <version>2.5.1</version>
         </dependency>
         <dependency>
             <groupId>net.i2p.crypto</groupId>