Merge branch 'master' into 3.0.0

Author: tomaswolf

.mvn/wrapper/maven-wrapper.properties

@@ -1,3 +1,3 @@
 wrapperVersion=3.3.4
 distributionType=only-script
-distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.12/binaries/apache-maven-3.9.12-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip

CHANGES.md

@@ -11,7 +11,7 @@ generated by [japicmp](https://siom79.github.io/japicmp) are published at
 Version 3 includes all the features and bug fixes of version 2, including the
 [latest ones](https://github.com/apache/mina-sshd/blob/master/CHANGES.md#planned-for-next-version).
 
-* For building Apache MINA SSHD 3.0, **Java >= 24** and Apache **Maven >= 3.9.11** are required. Generated artifacts
+* For building Apache MINA SSHD 3.0, **Java >= 24** and Apache **Maven >= 3.9.12** are required. Generated artifacts
   still use Java 8 as minimum runtime requirement.
 
 ## Milestone 1: Pre-Release 3.0.0-M1

pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>36</version>
+        <version>37</version>
     </parent>
 
     <groupId>org.apache.sshd</groupId>
@@ -109,12 +109,12 @@
             <!-- mockito 5.0 requires Java 11. -->
         <mockito.version>4.11.0</mockito.version>
         <testcontainers.version>1.21.3</testcontainers.version>
-        <grpc.version>1.76.0</grpc.version> <!-- Used only in tests -->
+        <grpc.version>1.78.0</grpc.version> <!-- Used only in tests -->
 
         <maven.archiver.version>3.6.5</maven.archiver.version>
-        <plexus.archiver.version>4.10.3</plexus.archiver.version>
+        <plexus.archiver.version>4.11.0</plexus.archiver.version>
         <!-- See https://pmd.github.io/ for available latest version -->
-        <pmd.version>7.20.0</pmd.version>
+        <pmd.version>7.22.0</pmd.version>
         <japicmp.version>0.23.1</japicmp.version>
         <sshd.tests.timeout.factor>1.0</sshd.tests.timeout.factor>
         <sshd.tests.rerun.count>2</sshd.tests.rerun.count>
@@ -217,7 +217,7 @@
                     <plugin>
                         <groupId>org.owasp</groupId>
                         <artifactId>dependency-check-maven</artifactId>
-                        <version>12.1.8</version>
+                        <version>12.2.0</version>
                             <!-- see https://jeremylong.github.io/DependencyCheck/dependency-check-maven/configuration.html -->
                         <configuration>
                                 <!-- see https://github.com/jeremylong/DependencyCheck/issues/1394 -->

sshd-contrib/pom.xml

@@ -98,7 +98,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.27.6</version>
+            <version>3.27.7</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultForwarder.java

@@ -848,10 +848,9 @@ public void sessionClosed(IoSession session) throws Exception {
                 log.debug("sessionClosed({}) closing channel={} after {} messages - cause={}",
                         session, channel, messagesCounter, (cause == null) ? null : cause.getClass().getSimpleName());
             }
-            if (channel == null) {
-                return;
+            if (channel != null) {
+                channel.close(false);
             }
-            channel.close(cause != null);
         }
 
         @Override

sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java

@@ -22,8 +22,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
 import java.io.StreamCorruptedException;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
@@ -90,6 +88,7 @@
 import org.apache.sshd.util.test.TestChannelListener;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.MethodOrderer.MethodName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
@@ -284,6 +283,7 @@ public String toString() {
      * read the data, filling the ssh window and the tcp socket - the server session becomes idle, but the ssh
      * disconnect message can't be written - the server session is forcibly closed
      */
+    @Disabled("Unstable test")
     @Test
     void serverIdleTimeoutWithForce() throws Exception {
         final long idleTimeoutValue = TimeUnit.SECONDS.toMillis(5L);
@@ -329,12 +329,8 @@ public String toString() {
 
         client.start();
         try (ClientSession s = createTestClientSession(sshd);
-             ChannelExec shell = s.createExecChannel("normal");
-             // Create a pipe that will block reading when the buffer is full
-             PipedInputStream pis = new PipedInputStream();
-             PipedOutputStream pos = new PipedOutputStream(pis)) {
+             ChannelExec shell = s.createExecChannel("normal")) {
 
-            shell.setOut(pos);
             shell.open().verify(OPEN_TIMEOUT);
 
             assertTrue(channelListener.waitForActiveChannelsChange(5L, TimeUnit.SECONDS),

sshd-netty/pom.xml

@@ -40,7 +40,7 @@
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-bom</artifactId>
-                <version>4.2.0.Final</version>
+                <version>4.2.10.Final</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>