[maven-wagon] branch master updated: [WAGON-564] SSH connection failure because 'preferredAuthentications' option is ignored if password isn't set

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git


The following commit(s) were added to refs/heads/master by this push:
     new 184cdad  [WAGON-564] SSH connection failure because 'preferredAuthentications' option is ignored if password isn't set
184cdad is described below

commit 184cdad07a78cedcfdce68b6d8b05040593f4176
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jul 25 21:52:05 2019 +0200

    [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.
---
 .../org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 @@ public abstract class AbstractJschWagon
     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 @@ public abstract class AbstractJschWagon
             config.setProperty( "StrictHostKeyChecking", strictHostKeyChecking );
         }
 
-        if ( authenticationInfo.getPassword() != null )
+        if ( preferredAuthentications != null )
         {
             config.setProperty( "PreferredAuthentications", preferredAuthentications );
         }