diff --git a/README.adoc b/README.adoc index ea11dc61..4561566e 100644 --- a/README.adoc +++ b/README.adoc @@ -1,7 +1,7 @@ = sshj - SSHv2 library for Java Jeroen van Erp :sshj_groupid: com.hierynomus -:sshj_version: 0.18.0 +:sshj_version: 0.19.0 :source-highlighter: pygments image:https://travis-ci.org/hierynomus/sshj.svg?branch=master[link="https://travis-ci.org/hierynomus/sshj"] @@ -99,8 +99,9 @@ Google Group: http://groups.google.com/group/sshj-users Fork away! == Release history -SSHJ 0.19.0 (????-??-??):: +SSHJ 0.19.0 (2016-11-25):: * Fixed https://github.com/hierynomus/sshj/issues/276[#276]: Add support for ed-25519 and new OpenSSH key format +* Fixed https://github.com/hierynomus/sshj/issues/280[#280]: Read version from a generated sshj.properties file to correctly output version during negotiation SSHJ 0.18.0 (2016-09-30):: * Fixed Android compatibility * Upgrade to Gradle 3.0 diff --git a/examples/pom.xml b/examples/pom.xml index d6ffe7a7..c977fed4 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -24,7 +24,7 @@ com.hierynomus sshj-examples jar - 0.14.0 + 0.19.0 sshj-examples Examples for SSHv2 library for Java @@ -55,7 +55,7 @@ com.hierynomus sshj - 0.15.0 + 0.18.0 diff --git a/examples/src/main/java/net/schmizz/sshj/examples/RudimentaryPTY.java b/examples/src/main/java/net/schmizz/sshj/examples/RudimentaryPTY.java index fde392f8..e8264a73 100644 --- a/examples/src/main/java/net/schmizz/sshj/examples/RudimentaryPTY.java +++ b/examples/src/main/java/net/schmizz/sshj/examples/RudimentaryPTY.java @@ -9,6 +9,7 @@ import net.schmizz.sshj.transport.verification.OpenSSHKnownHosts; import java.io.File; import java.io.IOException; +import net.schmizz.sshj.common.LoggerFactory; /** A very rudimentary psuedo-terminal based on console I/O. */ class RudimentaryPTY { @@ -33,18 +34,18 @@ class RudimentaryPTY { final Shell shell = session.startShell(); - new StreamCopier(shell.getInputStream(), System.out) + new StreamCopier(shell.getInputStream(), System.out, LoggerFactory.DEFAULT) .bufSize(shell.getLocalMaxPacketSize()) .spawn("stdout"); - new StreamCopier(shell.getErrorStream(), System.err) + new StreamCopier(shell.getErrorStream(), System.err, LoggerFactory.DEFAULT) .bufSize(shell.getLocalMaxPacketSize()) .spawn("stderr"); // Now make System.in act as stdin. To exit, hit Ctrl+D (since that results in an EOF on System.in) // This is kinda messy because java only allows console input after you hit return // But this is just an example... a GUI app could implement a proper PTY - new StreamCopier(System.in, shell.getOutputStream()) + new StreamCopier(System.in, shell.getOutputStream(), LoggerFactory.DEFAULT) .bufSize(shell.getRemoteMaxPacketSize()) .copy(); diff --git a/examples/src/main/java/net/schmizz/sshj/examples/X11.java b/examples/src/main/java/net/schmizz/sshj/examples/X11.java index 4eadf4fa..fa81b2c1 100644 --- a/examples/src/main/java/net/schmizz/sshj/examples/X11.java +++ b/examples/src/main/java/net/schmizz/sshj/examples/X11.java @@ -5,6 +5,7 @@ import net.schmizz.sshj.common.StreamCopier; import net.schmizz.sshj.connection.channel.direct.Session; import net.schmizz.sshj.connection.channel.direct.Session.Command; import net.schmizz.sshj.connection.channel.forwarded.SocketForwardingConnectListener; +import net.schmizz.sshj.common.LoggerFactory; import java.io.IOException; import java.net.InetSocketAddress; @@ -42,8 +43,8 @@ public class X11 { final Command cmd = sess.exec("/usr/X11/bin/xcalc"); - new StreamCopier(cmd.getInputStream(), System.out).spawn("stdout"); - new StreamCopier(cmd.getErrorStream(), System.err).spawn("stderr"); + new StreamCopier(cmd.getInputStream(), System.out, LoggerFactory.DEFAULT).spawn("stdout"); + new StreamCopier(cmd.getErrorStream(), System.err, LoggerFactory.DEFAULT).spawn("stderr"); // Wait for session & X11 channel to get closed ssh.getConnection().join();