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 fff5fe20ce08a475e50e2f2346b01072398adeec Merge: a56c8f5cc a3d225109 Author: Thomas Wolf <[email protected]> AuthorDate: Sat Mar 14 18:37:17 2026 +0100 Merge branch 'master' into 3.0.0 .mvn/wrapper/maven-wrapper.properties | 2 +- CHANGES.md | 2 +- pom.xml | 10 +++++----- sshd-contrib/pom.xml | 2 +- .../java/org/apache/sshd/common/forward/DefaultForwarder.java | 5 ++--- sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java | 10 +++------- sshd-netty/pom.xml | 2 +- 7 files changed, 14 insertions(+), 19 deletions(-) diff --cc CHANGES.md index 3af9160ea,d4f4dafbf..673920bea --- a/CHANGES.md +++ b/CHANGES.md @@@ -1,38 -1,41 +1,38 @@@ # Previous Versions -* [Version 2.1.0 to 2.2.0](./docs/changes/2.2.0.md) -* [Version 2.2.0 to 2.3.0](./docs/changes/2.3.0.md) -* [Version 2.3.0 to 2.4.0](./docs/changes/2.4.0.md) -* [Version 2.4.0 to 2.5.0](./docs/changes/2.5.0.md) -* [Version 2.5.0 to 2.5.1](./docs/changes/2.5.1.md) -* [Version 2.5.1 to 2.6.0](./docs/changes/2.6.0.md) -* [Version 2.6.0 to 2.7.0](./docs/changes/2.7.0.md) -* [Version 2.7.0 to 2.8.0](./docs/changes/2.8.0.md) -* [Version 2.8.0 to 2.9.0](./docs/changes/2.9.0.md) -* [Version 2.9.0 to 2.9.1](./docs/changes/2.9.1.md) -* [Version 2.9.1 to 2.9.2](./docs/changes/2.9.2.md) -* [Version 2.9.2 to 2.10.0](./docs/changes/2.10.0.md) -* [Version 2.10.0 to 2.11.0](./docs/changes/2.11.0.md) -* [Version 2.11.0 to 2.12.0](./docs/changes/2.12.0.md) -* [Version 2.12.0 to 2.12.1](./docs/changes/2.12.1.md) -* [Version 2.12.1 to 2.13.0](./docs/changes/2.13.0.md) -* [Version 2.13.0 to 2.13.1](./docs/changes/2.13.1.md) -* [Version 2.13.1 to 2.13.2](./docs/changes/2.13.2.md) -* [Version 2.13.2 to 2.14.0](./docs/changes/2.14.0.md) -* [Version 2.14.0 to 2.15.0](./docs/changes/2.15.0.md) -* [Version 2.15.0 to 2.16.0](./docs/changes/2.16.0.md) -* [Version 2.16.0 to 2.17.0](./docs/changes/2.17.0.md) - -# Latest Version - -* **[Version 2.17.0 to 2.17.1](./docs/changes/2.17.1.md)** - -# Planned for Next Version +* [Change Notes for Version 2](./docs/changes/version2.md) -## Bug Fixes +# Version 3 -* [GH-879](https://github.com/apache/mina-sshd/issues/879) Close SSH channel gracefully on exception in port forwarding +**This is work in progress.** Version 3 contains many API breaks from version 2. API comparison reports +generated by [japicmp](https://siom79.github.io/japicmp) are published at +[https://apache.github.io/mina-sshd](https://apache.github.io/mina-sshd). -## New Features +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 + +Complete refactoring of the SSH transport protocol. New feature: support for client-side proxies. + +* [Change notes for 3.0.0-M1](./docs/changes/3.0.0-M1.md) + +## Milestone 2: Pre-Release 3.0.0-M2 + +Refactoring of cryptography. New feature: multi-release JARs for `sshd-common` and `sshd-osgi` and using on +newer Java versions the already built-in cryptographic algorithms for ChaCha20, ed25519, and ML-KEM. -## Potential Compatibility Issues +* [Change notes for 3.0.0-M2](./docs/changes/3.0.0-M2.md) + +# Planned for the Next Milestone Release + + +## Bug Fixes + +* [GH-852](https://github.com/apache/mina-sshd/issues/852) Fix wrong import ## Major Code Re-factoring diff --cc pom.xml index d99bfc539,e50762840..26bb6bb71 --- a/pom.xml +++ b/pom.xml @@@ -109,13 -112,13 +109,13 @@@ <!-- 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> diff --cc sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java index a6764b6b3,8126d5283..bd7ede74c --- a/sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java @@@ -88,8 -84,9 +86,9 @@@ import org.apache.sshd.util.test.BaseTe import org.apache.sshd.util.test.EchoShell; import org.apache.sshd.util.test.EchoShellFactory; import org.apache.sshd.util.test.TestChannelListener; -import org.junit.Ignore; 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 -347,7 +283,7 @@@ class ServerTest extends BaseTestSuppor * 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 */ - @Ignore("Unstable test") ++ @Disabled("Unstable test") @Test void serverIdleTimeoutWithForce() throws Exception { final long idleTimeoutValue = TimeUnit.SECONDS.toMillis(5L);
