Upgraded MINA core version to 2.0.19
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/7bd6f9cf Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/7bd6f9cf Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/7bd6f9cf Branch: refs/heads/master Commit: 7bd6f9cf7b784dcf5ed59772f5d7891fc7945cc8 Parents: ad65e9c Author: Lyor Goldstein <lyor.goldst...@gmail.com> Authored: Wed Jun 13 07:54:32 2018 +0300 Committer: Lyor Goldstein <lyor.goldst...@gmail.com> Committed: Wed Jun 13 07:54:58 2018 +0300 ---------------------------------------------------------------------- pom.xml | 11 ++++++++++- sshd-ldap/pom.xml | 10 ---------- .../java/org/apache/sshd/common/io/mina/MinaService.java | 6 ------ 3 files changed, 10 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/7bd6f9cf/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5d5deb4..e205602 100644 --- a/pom.xml +++ b/pom.xml @@ -289,10 +289,19 @@ <artifactId>groovy-all</artifactId> <version>${groovy.version}</version> </dependency> + <!-- NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE + + Upgrading it beyond 2.0.19 causes problems for the sshd-ldap + since the Apache DS server used to run the unit tests fails + in LdapProtocolHandler#messageReceived due to the fact that + the SslFilter#SESSION_SECURED has been moved in version 2.0.18. + + See https://issues.apache.org/jira/browse/DIRMINA-1087 + --> <dependency> <groupId>org.apache.mina</groupId> <artifactId>mina-core</artifactId> - <version>2.0.18</version> + <version>2.0.19</version> </dependency> <dependency> <groupId>tomcat</groupId> http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/7bd6f9cf/sshd-ldap/pom.xml ---------------------------------------------------------------------- diff --git a/sshd-ldap/pom.xml b/sshd-ldap/pom.xml index 0da7105..3415c1f 100644 --- a/sshd-ldap/pom.xml +++ b/sshd-ldap/pom.xml @@ -70,19 +70,9 @@ </dependency> <!-- Test dependencies --> - <!-- NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE - - Upgrading it beyond 2.0.17 causes problems for the sshd-ldap - since the Apache DS server used to run the unit tests fails - in LdapProtocolHandler#messageReceived due to the fact that - the SslFilter#SESSION_SECURED has been moved in version 2.0.18. - - See https://issues.apache.org/jira/browse/DIRMINA-1087 - --> <dependency> <groupId>org.apache.mina</groupId> <artifactId>mina-core</artifactId> - <version>2.0.17</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/7bd6f9cf/sshd-mina/src/main/java/org/apache/sshd/common/io/mina/MinaService.java ---------------------------------------------------------------------- diff --git a/sshd-mina/src/main/java/org/apache/sshd/common/io/mina/MinaService.java b/sshd-mina/src/main/java/org/apache/sshd/common/io/mina/MinaService.java index ab5a18a..2a0c2ec 100644 --- a/sshd-mina/src/main/java/org/apache/sshd/common/io/mina/MinaService.java +++ b/sshd-mina/src/main/java/org/apache/sshd/common/io/mina/MinaService.java @@ -31,7 +31,6 @@ import org.apache.mina.core.service.IoService; import org.apache.mina.core.session.IdleStatus; import org.apache.mina.core.session.IoSession; import org.apache.mina.core.session.IoSessionConfig; -import org.apache.mina.filter.FilterEvent; import org.apache.mina.transport.socket.SocketSessionConfig; import org.apache.mina.transport.socket.nio.NioSession; import org.apache.sshd.common.Closeable; @@ -104,11 +103,6 @@ public abstract class MinaService extends AbstractCloseable implements org.apach } @Override - public void event(IoSession session, FilterEvent event) throws Exception { - // Empty handler - } - - @Override public void inputClosed(IoSession session) throws Exception { session.closeNow(); }
