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 2f6d6dda9491e323604c61d6f9bd9d6a0b1ec202 Author: Thomas Wolf <[email protected]> AuthorDate: Sat Mar 14 21:39:48 2026 +0100 [releng] Pre-release updates * Documentation * Remove obsolete <additionalparams> of maven-javadoc-plugin --- CHANGES.md | 18 +++++++----------- docs/changes/version2.md | 2 ++ sshd-git/pom.xml | 3 --- sshd-ldap/pom.xml | 3 --- sshd-mina/pom.xml | 3 --- sshd-netty/pom.xml | 3 --- sshd-scp/pom.xml | 3 --- sshd-sftp/pom.xml | 3 --- sshd-site/src/site/markdown/index.md | 1 + sshd-spring-sftp/pom.xml | 3 --- 10 files changed, 10 insertions(+), 32 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 17b8fd673..358c15a8d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,8 +8,8 @@ generated by [japicmp](https://siom79.github.io/japicmp) are published at [https://apache.github.io/mina-sshd](https://apache.github.io/mina-sshd). -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). +Version 3 includes all the features and bug fixes of [version 2.17.1](./docs/changes/2.17.1.md) and up to +[commit a3d22510](https://github.com/apache/mina-sshd/blob/a3d22510/CHANGES.md#planned-for-next-version). * 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. @@ -27,16 +27,12 @@ newer Java versions the already built-in cryptographic algorithms for ChaCha20, * [Change notes for 3.0.0-M2](./docs/changes/3.0.0-M2.md) -# Planned for the Next Milestone Release +## Milestone 3: Pre-Release 3.0.0-M3 +This is a minor update to bring the improvements done in 2.17.x into the 3.0.0 stream. Besides that, +there are only two bug fixes from 3.0.0-M2: -## Bug Fixes +### Bug Fixes -* [GH-852](https://github.com/apache/mina-sshd/issues/852) Fix wrong import +* [GH-852](https://github.com/apache/mina-sshd/issues/852) (Bug in 3.0.0-M2) Fix wrong import * [GH-891](https://github.com/apache/mina-sshd/issues/891) (Regression in 3.0.0-M1) Fix format of injected SSH_MSG_IGNORE - -## Major Code Re-factoring - - -## New Features - diff --git a/docs/changes/version2.md b/docs/changes/version2.md index 49bfd606c..0a1c47d9b 100644 --- a/docs/changes/version2.md +++ b/docs/changes/version2.md @@ -21,3 +21,5 @@ * [Version 2.13.2 to 2.14.0](./2.14.0.md) * [Version 2.14.0 to 2.15.0](./2.15.0.md) * [Version 2.15.0 to 2.16.0](./2.16.0.md) +* [Version 2.16.0 to 2.17.0](./2.17.0.md) +* [Version 2.17.0 to 2.17.1](./2.17.1.md) diff --git a/sshd-git/pom.xml b/sshd-git/pom.xml index 2851a6fe3..57c928887 100644 --- a/sshd-git/pom.xml +++ b/sshd-git/pom.xml @@ -150,9 +150,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <additionalparam>-Xdoclint:none</additionalparam> - </configuration> </plugin> </plugins> </build> diff --git a/sshd-ldap/pom.xml b/sshd-ldap/pom.xml index eada261ee..6017cff9e 100644 --- a/sshd-ldap/pom.xml +++ b/sshd-ldap/pom.xml @@ -146,9 +146,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <additionalparam>-Xdoclint:none</additionalparam> - </configuration> </plugin> </plugins> </build> diff --git a/sshd-mina/pom.xml b/sshd-mina/pom.xml index e7387d035..074101fcd 100644 --- a/sshd-mina/pom.xml +++ b/sshd-mina/pom.xml @@ -179,9 +179,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <additionalparam>-Xdoclint:none</additionalparam> - </configuration> </plugin> </plugins> </build> diff --git a/sshd-netty/pom.xml b/sshd-netty/pom.xml index 51c0259fb..154289111 100644 --- a/sshd-netty/pom.xml +++ b/sshd-netty/pom.xml @@ -157,9 +157,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <additionalparam>-Xdoclint:none</additionalparam> - </configuration> </plugin> </plugins> </build> diff --git a/sshd-scp/pom.xml b/sshd-scp/pom.xml index 4a6c03c54..aa34e2c38 100644 --- a/sshd-scp/pom.xml +++ b/sshd-scp/pom.xml @@ -112,9 +112,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <additionalparam>-Xdoclint:none</additionalparam> - </configuration> </plugin> </plugins> </build> diff --git a/sshd-sftp/pom.xml b/sshd-sftp/pom.xml index d22546341..994bef6e7 100644 --- a/sshd-sftp/pom.xml +++ b/sshd-sftp/pom.xml @@ -124,9 +124,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <additionalparam>-Xdoclint:none</additionalparam> - </configuration> </plugin> </plugins> </build> diff --git a/sshd-site/src/site/markdown/index.md b/sshd-site/src/site/markdown/index.md index 56e84f506..cbed912f7 100644 --- a/sshd-site/src/site/markdown/index.md +++ b/sshd-site/src/site/markdown/index.md @@ -47,6 +47,7 @@ But we can give you a rough outline of what we want to do: * **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. +* **3.0.0-M3**: Bug fix release of 3.0.0-M2, and update base to 2.17.1. Further possible milestones (the order might change, though): diff --git a/sshd-spring-sftp/pom.xml b/sshd-spring-sftp/pom.xml index fc2738886..83d3e8c86 100644 --- a/sshd-spring-sftp/pom.xml +++ b/sshd-spring-sftp/pom.xml @@ -112,9 +112,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <additionalparam>-Xdoclint:none</additionalparam> - </configuration> </plugin> </plugins> </build>
