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

tomaswolf pushed a commit to branch rc-3.0.0-M6
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git

commit dae450ee7a603945a75cba2e22c7ecc1779df510
Author: Thomas Wolf <[email protected]>
AuthorDate: Sat Sep 26 15:25:36 2026 +0200

    Prepare release documentation
---
 CHANGES.md               | 10 ++++++++--
 docs/changes/3.0.0-M6.md | 25 +++++++++++++++++++++++++
 docs/changes/version2.md |  1 +
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 80bf64cb0..ebd954520 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -40,18 +40,24 @@ Merges 2.18.0 into the 3.0.0 stream.
 
 * [Change notes for 3.0.0-M4](./docs/changes/3.0.0-M4.md)
 
-## Milestone 4: Pre-Release 3.0.0-M5
+## Milestone 5: Pre-Release 3.0.0-M5
 
 Merges 2.19.0 into the 3.0.0 stream.
 
 * [Change notes for 3.0.0-M5](./docs/changes/3.0.0-M5.md)
 
+## Milestone 6: Pre-Release 3.0.0-M6
+
+Merges 2.20.0 into the 3.0.0 stream and fixes a regression introduced in 
3.0.0-M1.
+
+* [Change notes for 3.0.0-M6](./docs/changes/3.0.0-M6.md)
+
 # Planned for the Next Milestone Release
 
 ## Bug Fixes
 
-* `HttpProxyConnector`: handle fragmented responses from the proxy
 
 ## Major Code Re-factoring
 
+
 ## New Features
diff --git a/docs/changes/3.0.0-M6.md b/docs/changes/3.0.0-M6.md
new file mode 100644
index 000000000..8ea911a3b
--- /dev/null
+++ b/docs/changes/3.0.0-M6.md
@@ -0,0 +1,25 @@
+# Milestone Pre-Release 3.0.0-M6
+
+This milestone release merges the 2.20.0 branch. It includes all the features 
and bug fixes of [version 2.20.0](./2.20.0.md).
+Besides that, there is one bug fix and a minor improvement.
+
+* [Change notes for 3.0.0-M1](./3.0.0-M1.md)
+* [Change notes for 3.0.0-M2](./3.0.0-M2.md)
+* [Change notes for 3.0.0-M3](./3.0.0-M3.md)
+* [Change notes for 3.0.0-M4](./3.0.0-M4.md)
+* [Change notes for 3.0.0-M5](./3.0.0-M5.md)
+
+* 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.
+
+## Bug Fixes
+
+* [GH-909]((https://github.com/apache/mina-sshd/issues/909) Fix 
KexOutputHandler self-deadlock during shutdown (regression since 3.0.0-M1)
+
+## Major Code Re-factoring
+
+None.
+
+## New Features
+
+* `HttpProxyConnector`: handle fragmented responses from the proxy
diff --git a/docs/changes/version2.md b/docs/changes/version2.md
index 86a244857..0069917c0 100644
--- a/docs/changes/version2.md
+++ b/docs/changes/version2.md
@@ -25,3 +25,4 @@
 * [Version 2.17.0 to 2.17.1](./2.17.1.md)
 * [Version 2.17.1 to 2.18.0](./2.18.0.md)
 * [Version 2.18.0 to 2.19.0](./2.19.0.md)
+* [Version 2.19.0 to 2.20.0](./2.20.0.md)

Reply via email to