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 aa9c94bbedd0b4c15510fb697e0ffdfce23b0947 Author: Thomas Wolf <[email protected]> AuthorDate: Sat Oct 18 21:53:28 2025 +0200 [releng] Release preparation for 3.0.0-M2 Update CHANGES.md. Make sure that the maven-source-plugin uses a modern commons-io. Somehow it picks up 2.11.0, which is way too old. Force 2.20.0. Set deployAtEnd=true to avoid that anything is pushed to the deployment repository if something goes wrong when building a release. Remove <links> from maven-javadoc-plugin config; it fails with Java 25. Exclude sshd-benchmarks and sshd-test from javadoc generation. --- CHANGES.md | 9 ++++++--- pom.xml | 16 +++++++++++++--- sshd-benchmarks/pom.xml | 1 + sshd-test/pom.xml | 1 + 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 41c02e219..1d40a2ba8 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.16.0](./docs/changes/2.16.0.md) and up to +[commit f9887391](https://github.com/apache/mina-sshd/blob/f9887391/CHANGES.md#planned-for-next-version). ## Milestone 1: Pre-Release 3.0.0-M1 @@ -17,7 +17,10 @@ Complete refactoring of the SSH transport protocol. New feature: support for cli * [Change notes for 3.0.0-M1](./docs/changes/3.0.0-M1.md) -# Planned for the Next Milestone Release +# 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. * For building Apache MINA SSHD 3.0, Java >= 24 and Apache Maven >= 3.9.11 are required. Generated artifacts still use Java 8 as minimum runtime requirement. diff --git a/pom.xml b/pom.xml index 391721093..74b981258 100644 --- a/pom.xml +++ b/pom.xml @@ -701,6 +701,14 @@ <build> <pluginManagement> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <!-- In case something goes wrong: don't push bundles to the deployment repository --> + <deployAtEnd>true</deployAtEnd> + </configuration> + </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> @@ -792,6 +800,11 @@ <artifactId>plexus-archiver</artifactId> <version>${plexus.archiver.version}</version> </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.20.0</version> + </dependency> </dependencies> </plugin> <plugin> @@ -809,9 +822,6 @@ <additionalOptions>-Xdoclint:-missing</additionalOptions> <encoding>${project.build.sourceEncoding}</encoding> <quiet>true</quiet> - <links> - <link>http://docs.oracle.com/javase/${java.sdk.version}/docs/api</link> - </links> </configuration> <dependencies> <dependency> diff --git a/sshd-benchmarks/pom.xml b/sshd-benchmarks/pom.xml index 62faabac9..4ad037fc0 100644 --- a/sshd-benchmarks/pom.xml +++ b/sshd-benchmarks/pom.xml @@ -36,6 +36,7 @@ <maven.compiler.release>11</maven.compiler.release> <maven.install.skip>true</maven.install.skip> <maven.deploy.skip>true</maven.deploy.skip> + <maven.javadoc.skip>true</maven.javadoc.skip> <japicmp.skip>true</japicmp.skip> </properties> diff --git a/sshd-test/pom.xml b/sshd-test/pom.xml index 65ec8e838..e05cf9812 100644 --- a/sshd-test/pom.xml +++ b/sshd-test/pom.xml @@ -35,6 +35,7 @@ <projectRoot>${project.basedir}/..</projectRoot> <maven.install.skip>true</maven.install.skip> <maven.deploy.skip>true</maven.deploy.skip> + <maven.javadoc.skip>true</maven.javadoc.skip> <japicmp.skip>true</japicmp.skip> </properties>
