Repository: maven-wagon Updated Branches: refs/heads/master 5d2f9399e -> 302ae79cb
[WAGON-413] On pick either public key or password identity. Not both since public key gets ignored. Patch provided by Thomas Strecker Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/302ae79c Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/302ae79c Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/302ae79c Branch: refs/heads/master Commit: 302ae79cb5a19e74f50d2de679f612bf0ff9484a Parents: 5d2f939 Author: dantran <dant...@gmail.com> Authored: Fri May 29 18:28:05 2015 -0700 Committer: dantran <dant...@gmail.com> Committed: Fri May 29 18:28:05 2015 -0700 ---------------------------------------------------------------------- .../providers/ssh/jsch/AbstractJschWagon.java | 32 +++++++++++--------- 1 file changed, 18 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/302ae79c/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 7367b34..9ae7625 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 @@ -128,20 +128,7 @@ public abstract class AbstractJschWagon throw new AuthenticationException( e.getMessage() ); } - try - { - Connector connector = ConnectorFactory.getDefault().createConnector(); - if ( connector != null ) - { - IdentityRepository repo = new RemoteIdentityRepository( connector ); - sch.setIdentityRepository( repo ); - } - } - catch ( AgentProxyException e ) - { - fireSessionDebug( "Unable to connect to agent: " + e.toString() ); - } - + //can only pick one method of authentication if ( privateKey != null && privateKey.exists() ) { fireSessionDebug( "Using private key: " + privateKey ); @@ -154,6 +141,23 @@ public abstract class AbstractJschWagon throw new AuthenticationException( "Cannot connect. Reason: " + e.getMessage(), e ); } } + else + { + try + { + Connector connector = ConnectorFactory.getDefault().createConnector(); + if ( connector != null ) + { + IdentityRepository repo = new RemoteIdentityRepository( connector ); + sch.setIdentityRepository( repo ); + } + } + catch ( AgentProxyException e ) + { + fireSessionDebug( "Unable to connect to agent: " + e.toString() ); + } + + } String host = getRepository().getHost(); int port =
