(mina-sshd) 19/19: Merge branch 'master' into 3.0.0

[twolf]

This is an automated email from the ASF dual-hosted git repository.

twolf pushed a commit to branch dev_3.0
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git

commit 526432a2f28aea40c45a20adaf82f27b2a7c30dd
Merge: 44654f273 2a2eef02d
Author: Thomas Wolf <tw...@apache.org>
AuthorDate: Sun Sep 21 12:08:31 2025 +0200

    Merge branch 'master' into 3.0.0

 docs/dependencies.md                                    |  4 +++-
 .../sshd/common/config/keys/OpenSshCertificate.java     |  4 +---
 sshd-contrib/pom.xml                                    |  2 +-
 .../org/apache/sshd/sftp/client/SftpTransferTest.java   | 17 +++++++++++++++++
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --cc 
sshd-common/src/main/java/org/apache/sshd/common/config/keys/OpenSshCertificate.java
index ef6a5899f,b18cb5d01..ea007982d
--- 
a/sshd-common/src/main/java/org/apache/sshd/common/config/keys/OpenSshCertificate.java
+++ 
b/sshd-common/src/main/java/org/apache/sshd/common/config/keys/OpenSshCertificate.java
@@@ -24,11 -25,9 +24,10 @@@ import java.util.Arrays
  import java.util.Collection;
  import java.util.Collections;
  import java.util.List;
 -import java.util.Objects;
  import java.util.SortedMap;
- import java.util.concurrent.TimeUnit;
  
 +import org.apache.sshd.common.NamedFactory;
 +import org.apache.sshd.common.signature.Signature;
  import org.apache.sshd.common.util.ValidateUtils;
  
  /**
diff --cc 
sshd-sftp/src/test/java/org/apache/sshd/sftp/client/SftpTransferTest.java
index 847a09f37,b3db683f5..f2f3b67d5
--- a/sshd-sftp/src/test/java/org/apache/sshd/sftp/client/SftpTransferTest.java
+++ b/sshd-sftp/src/test/java/org/apache/sshd/sftp/client/SftpTransferTest.java
@@@ -35,24 -38,47 +38,38 @@@ import org.junit.jupiter.api.MethodOrde
  import org.junit.jupiter.api.TestMethodOrder;
  import org.junit.jupiter.params.ParameterizedTest;
  import org.junit.jupiter.params.provider.MethodSource;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
  
 -import static org.junit.jupiter.api.Assertions.fail;
 -
  @TestMethodOrder(MethodName.class)
 -public class SftpTransferTest extends AbstractSftpClientTestSupport {
 +class SftpTransferTest extends AbstractSftpClientTestSupport {
  
+     private static final Logger LOG = 
LoggerFactory.getLogger(SftpTransferTest.class);
+ 
      private static final int BUFFER_SIZE = 8192;
  
 -    private long rekeyBlockSize;
 -
 -    public void initSftpTransferTest(long rekeyBlockSize) throws IOException {
 -        this.rekeyBlockSize = rekeyBlockSize;
 -    }
 -
 -    public static List<Long> getParameters() {
 +    static List<Long> getParameters() {
          List<Long> params = new ArrayList<>();
          params.add(Long.valueOf(0));
          params.add(Long.valueOf(65536));
          return params;
      }
  
+     @BeforeAll
+     static void logExceptions() {
+         sshd.addSessionListener(new SessionListener() {
+             @Override
+             public void sessionException(Session session, Throwable t) {
+                 LOG.warn("**** Session {} caught exception", session, t);
+             }
+         });
+     }
+ 
      @MethodSource("getParameters")
      @ParameterizedTest(name = "REKEY_BLOCK_SIZE {0}")
 -    public void transferIntegrity(long rekeyBlockSize) throws IOException {
 -        initSftpTransferTest(rekeyBlockSize);
 +    void transferIntegrity(long rekeyBlockSize) throws IOException {
          for (int i = 0; i < 10; i++) {
 -            doTestTransferIntegrity(0);
 +            doTestTransferIntegrity(0, rekeyBlockSize);
          }
      }