Bump SSHD version to 2.9.1
Release-Notes: Update SSHD to 2.9.1
Change-Id: Ib2bff4077085001234a317ed8b8bb200a959cbe9
diff --git a/java/com/google/gerrit/sshd/ChannelIdTrackingUnknownChannelReferenceHandler.java b/java/com/google/gerrit/sshd/ChannelIdTrackingUnknownChannelReferenceHandler.java
index f8ab90e..b9ca79c 100644
--- a/java/com/google/gerrit/sshd/ChannelIdTrackingUnknownChannelReferenceHandler.java
+++ b/java/com/google/gerrit/sshd/ChannelIdTrackingUnknownChannelReferenceHandler.java
@@ -45,7 +45,7 @@
public class ChannelIdTrackingUnknownChannelReferenceHandler
extends DefaultUnknownChannelReferenceHandler implements ChannelListener {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
- public static final AttributeKey<Integer> LAST_CHANNEL_ID_KEY = new AttributeKey<>();
+ public static final AttributeKey<Long> LAST_CHANNEL_ID_KEY = new AttributeKey<>();
public static final ChannelIdTrackingUnknownChannelReferenceHandler TRACKER =
new ChannelIdTrackingUnknownChannelReferenceHandler();
@@ -56,9 +56,9 @@
@Override
public void channelInitialized(Channel channel) {
- int channelId = channel.getId();
+ long channelId = channel.getChannelId();
Session session = channel.getSession();
- Integer lastTracked = session.setAttribute(LAST_CHANNEL_ID_KEY, channelId);
+ Long lastTracked = session.setAttribute(LAST_CHANNEL_ID_KEY, channelId);
logger.atFine().log(
"channelInitialized(%s) updated last tracked channel ID %s => %s",
channel, lastTracked, channelId);
@@ -66,9 +66,9 @@
@Override
public Channel handleUnknownChannelCommand(
- ConnectionService service, byte cmd, int channelId, Buffer buffer) throws IOException {
+ ConnectionService service, byte cmd, long channelId, Buffer buffer) throws IOException {
Session session = service.getSession();
- Integer lastTracked = session.getAttribute(LAST_CHANNEL_ID_KEY);
+ Long lastTracked = session.getAttribute(LAST_CHANNEL_ID_KEY);
if ((lastTracked != null) && (channelId <= lastTracked.intValue())) {
// Use TRACE level in order to avoid messages flooding
logger.atFinest().log(
diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl
index d6f2ef63..cf50499 100644
--- a/tools/nongoogle.bzl
+++ b/tools/nongoogle.bzl
@@ -67,18 +67,18 @@
sha1 = "cb2f351bf4463751201f43bb99865235d5ba07ca",
)
- SSHD_VERS = "2.8.0"
+ SSHD_VERS = "2.9.1"
maven_jar(
name = "sshd-osgi",
artifact = "org.apache.sshd:sshd-osgi:" + SSHD_VERS,
- sha1 = "b2a59b73c045f40d5722b9160d4f909a646d86c9",
+ sha1 = "9ed1a653da98a1aabe3ae092ee8310299718e914",
)
maven_jar(
name = "sshd-sftp",
artifact = "org.apache.sshd:sshd-sftp:" + SSHD_VERS,
- sha1 = "d3cd9bc8d335b3ed1a86d2965deb4d202de27442",
+ sha1 = "6d01cb8138e60e97e3de08e96cc5a094c8ce2cac",
)
maven_jar(
@@ -96,7 +96,7 @@
maven_jar(
name = "sshd-mina",
artifact = "org.apache.sshd:sshd-mina:" + SSHD_VERS,
- sha1 = "02f78100cce376198be798a37c84aaf945e8a0f7",
+ sha1 = "5ab797b99630bb0c3e9ebcd8a3a6cad46408a79a",
)
maven_jar(
