commit 184cdad07a78cedcfdce68b6d8b05040593f4176
author Michael Osipov <michaelo@apache.org> Thu Jul 25 21:52:05 2019 +0200
committer Michael Osipov <michaelo@apache.org> Fri Jul 26 22:24:21 2019 +0200
tree c10f6bb58d1ae7316f5d99323846e447e1924a43
parent 242104121827f3bfc7ddcb562c020e20c4e3c460

[WAGON-564] SSH connection failure because 'preferredAuthentications' option is ignored if password isn't set

We do not set a default value anymore because since JSch 0.1.30 a value is
provided by default. Set the value if and only if user has provided one in
the settings.xml server section.

wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java

diff --git a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
index 7e87d2d..2e94cbc 100644
--- a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
+++ b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
@@ -96,7 +96,7 @@
     private volatile InteractiveUserInfo interactiveUserInfo;
 
     /**
-     * @plexus.configuration default-value="gssapi-with-mic,publickey,password,keyboard-interactive"
+     * @plexus.configuration
      */
     private volatile String preferredAuthentications;
 
@@ -251,7 +251,7 @@
             config.setProperty( "StrictHostKeyChecking", strictHostKeyChecking );
         }
 
-        if ( authenticationInfo.getPassword() != null )
+        if ( preferredAuthentications != null )
         {
             config.setProperty( "PreferredAuthentications", preferredAuthentications );
         }