| commit | d4c1240f894158b81d8da0f596dee15b136ca912 | [log] [tgz] |
|---|---|---|
| author | dantran <dantran@gmail.com> | Tue Oct 13 10:16:31 2015 -0700 |
| committer | dantran <dantran@gmail.com> | Tue Oct 13 10:16:31 2015 -0700 |
| tree | de61defbdfe6774b6c4f69cbb5f716a6256e7183 | |
| parent | ccdb965a88405fc5e2a1008d51022e7c555fbb9e [diff] |
Replace a deprecated API call and removed no longer needed comment
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 @@ } } - // TODO: Do these needs to be fields, or are they only used in openConnection()? this.authenticationInfo = authenticationInfo; this.proxyInfoProvider = proxyInfoProvider;
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 @@ */ 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.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 @@ String contents = getKnownHostsProvider().getContents(); if ( contents != null ) { - sch.setKnownHosts( new StringInputStream( contents ) ); + sch.setKnownHosts( new ByteArrayInputStream( contents.getBytes() ) ); } } catch ( JSchException e )