Repository: maven-wagon Updated Branches: refs/heads/master ccdb965a8 -> d4c1240f8
Replace a deprecated API call and removed no longer needed comment Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/d4c1240f Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/d4c1240f Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/d4c1240f Branch: refs/heads/master Commit: d4c1240f894158b81d8da0f596dee15b136ca912 Parents: ccdb965 Author: dantran <dant...@gmail.com> Authored: Tue Oct 13 10:16:31 2015 -0700 Committer: dantran <dant...@gmail.com> Committed: Tue Oct 13 10:16:31 2015 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/maven/wagon/AbstractWagon.java | 1 - .../apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/d4c1240f/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java ---------------------------------------------------------------------- diff --git a/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java b/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java index e808dc3..1a77a0b 100644 --- a/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java +++ b/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java @@ -206,7 +206,6 @@ public abstract class AbstractWagon } } - // TODO: Do these needs to be fields, or are they only used in openConnection()? this.authenticationInfo = authenticationInfo; this.proxyInfoProvider = proxyInfoProvider; http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/d4c1240f/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 84288e9..233afa1 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 @@ -20,6 +20,7 @@ package org.apache.maven.wagon.providers.ssh.jsch; */ import java.io.BufferedReader; +import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -52,7 +53,6 @@ import org.apache.maven.wagon.providers.ssh.knownhost.UnknownHostException; import org.apache.maven.wagon.proxy.ProxyInfo; import org.apache.maven.wagon.resource.Resource; import org.codehaus.plexus.util.IOUtil; -import org.codehaus.plexus.util.StringInputStream; import com.jcraft.jsch.ChannelExec; import com.jcraft.jsch.HostKey; @@ -229,7 +229,7 @@ public abstract class AbstractJschWagon String contents = getKnownHostsProvider().getContents(); if ( contents != null ) { - sch.setKnownHosts( new StringInputStream( contents ) ); + sch.setKnownHosts( new ByteArrayInputStream( contents.getBytes() ) ); } } catch ( JSchException e )
