You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2015/02/26 11:04:41 UTC
[1/2] mina-sshd git commit: Upgrade to 0.14.0-SNAPSHOT
Repository: mina-sshd
Updated Branches:
refs/heads/0.14.x a3e218152 -> 22ef603bd
Upgrade to 0.14.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/d7d3be6b
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/d7d3be6b
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/d7d3be6b
Branch: refs/heads/0.14.x
Commit: d7d3be6b3caa276f45513c2b89274afadad59786
Parents: a3e2181
Author: Guillaume Nodet <gn...@apache.org>
Authored: Tue Feb 24 10:03:50 2015 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Tue Feb 24 10:03:50 2015 +0100
----------------------------------------------------------------------
assembly/pom.xml | 4 ++--
pom.xml | 2 +-
sshd-core/pom.xml | 4 ++--
sshd-git/pom.xml | 4 ++--
sshd-pam/pom.xml | 4 ++--
sshd-sftp/pom.xml | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/d7d3be6b/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 7ebd56e..56a34b4 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -24,12 +24,12 @@
<parent>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sshd</groupId>
<artifactId>apache-sshd</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
<name>Apache Mina SSHD :: Assembly</name>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/d7d3be6b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ca326d2..371fbf6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.sshd</groupId>
<artifactId>sshd</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
<name>Apache Mina SSHD</name>
<packaging>pom</packaging>
<inceptionYear>2008</inceptionYear>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/d7d3be6b/sshd-core/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-core/pom.xml b/sshd-core/pom.xml
index 15753b7..dea63e0 100644
--- a/sshd-core/pom.xml
+++ b/sshd-core/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
</parent>
<artifactId>sshd-core</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
<name>Apache Mina SSHD :: Core</name>
<packaging>jar</packaging>
<inceptionYear>2008</inceptionYear>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/d7d3be6b/sshd-git/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-git/pom.xml b/sshd-git/pom.xml
index 8cdebdd..5001840 100644
--- a/sshd-git/pom.xml
+++ b/sshd-git/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
</parent>
<artifactId>sshd-git</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
<name>Apache Mina SSHD :: Git</name>
<packaging>jar</packaging>
<inceptionYear>2008</inceptionYear>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/d7d3be6b/sshd-pam/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-pam/pom.xml b/sshd-pam/pom.xml
index 15ff731..d16653b 100644
--- a/sshd-pam/pom.xml
+++ b/sshd-pam/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
</parent>
<artifactId>sshd-pam</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
<name>Apache Mina SSHD :: PAM</name>
<!--
<packaging>bundle</packaging>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/d7d3be6b/sshd-sftp/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-sftp/pom.xml b/sshd-sftp/pom.xml
index 50cb5b4..b58eb06 100644
--- a/sshd-sftp/pom.xml
+++ b/sshd-sftp/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
</parent>
<artifactId>sshd-sftp</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
<name>Apache Mina SSHD :: SFTP</name>
<packaging>jar</packaging>
<inceptionYear>2008</inceptionYear>
[2/2] mina-sshd git commit: [SSHD-414] Make the source code
(including tests) truly 1.5 compatible
Posted by gn...@apache.org.
[SSHD-414] Make the source code (including tests) truly 1.5 compatible
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/22ef603b
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/22ef603b
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/22ef603b
Branch: refs/heads/0.14.x
Commit: 22ef603bd119fb7c132f34b32fefc173979087d0
Parents: d7d3be6
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu Feb 26 11:03:55 2015 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu Feb 26 11:03:55 2015 +0100
----------------------------------------------------------------------
.../sshd/client/session/ClientSessionImpl.java | 1 -
.../sshd/common/session/AbstractSession.java | 3 ---
.../apache/sshd/server/session/ServerSession.java | 1 -
.../src/test/java/org/apache/sshd/ServerTest.java | 18 ++++++------------
4 files changed, 6 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22ef603b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
index 7d9a8c9..41c769d 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
@@ -193,7 +193,6 @@ public class ClientSessionImpl extends AbstractSession implements ClientSession
}
}
- @Override
public SshFuture switchToNoneCipher() throws IOException {
if (!(currentService instanceof AbstractConnectionService)
|| !((AbstractConnectionService) currentService).getChannels().isEmpty()) {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22ef603b/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java b/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java
index 6c342a9..975c877 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java
@@ -531,19 +531,16 @@ public abstract class AbstractSession extends CloseableUtils.AbstractInnerClosea
}
@SuppressWarnings("unchecked")
- @Override
public IoWriteFuture writePacket(Buffer buffer, long timeout, TimeUnit unit) throws IOException {
final IoWriteFuture writeFuture = writePacket(buffer);
final DefaultSshFuture<IoWriteFuture> future = (DefaultSshFuture<IoWriteFuture>) writeFuture;
final ScheduledFuture<?> sched = factoryManager.getScheduledExecutorService().schedule(new Runnable() {
- @Override
public void run() {
log.info("Timeout writing packet.");
future.setValue(new TimeoutException());
}
}, timeout, unit);
future.addListener(new SshFutureListener<IoWriteFuture>() {
- @Override
public void operationComplete(IoWriteFuture future) {
sched.cancel(false);
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22ef603b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java
index 4799c69..4e91549 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java
@@ -158,7 +158,6 @@ public class ServerSession extends AbstractSession {
if (!clientVersion.startsWith("SSH-2.0-")) {
String msg = "Unsupported protocol version: " + clientVersion;
ioSession.write(new Buffer((msg + "\n").getBytes())).addListener(new SshFutureListener<IoWriteFuture>() {
- @Override
public void operationComplete(IoWriteFuture future) {
close(true);
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22ef603b/sshd-core/src/test/java/org/apache/sshd/ServerTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/ServerTest.java b/sshd-core/src/test/java/org/apache/sshd/ServerTest.java
index 8e2ccee..914f1f6 100644
--- a/sshd-core/src/test/java/org/apache/sshd/ServerTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/ServerTest.java
@@ -337,7 +337,6 @@ public class ServerTest extends BaseTest {
public static class StreamCommand implements Command, Runnable {
public static class Factory implements CommandFactory {
- @Override
public Command createCommand(String name) {
return new StreamCommand(name);
}
@@ -352,32 +351,28 @@ public class ServerTest extends BaseTest {
this.name = name;
}
- @Override
public void setInputStream(InputStream in) {
-
+ // ignored
}
- @Override
public void setOutputStream(OutputStream out) {
this.out = out;
}
- @Override
public void setErrorStream(OutputStream err) {
-
+ // ignored
}
- @Override
public void setExitCallback(ExitCallback callback) {
-
+ // ignored
}
- @Override
public void start(Environment env) throws IOException {
- new Thread(this).start();
+ Thread t=new Thread(this);
+ t.setDaemon(true);
+ t.start();
}
- @Override
public void destroy() {
synchronized (name) {
if ("block".equals(name)) {
@@ -390,7 +385,6 @@ public class ServerTest extends BaseTest {
}
}
- @Override
public void run() {
try {
Thread.sleep(5000);