Skip to content

Commit 2f6d6dd

Browse files
tomaswolftomaswolf
committed
[releng] Pre-release updates
* Documentation * Remove obsolete <additionalparams> of maven-javadoc-plugin
1 parent d29ae24 commit 2f6d6dd

10 files changed

Lines changed: 10 additions & 32 deletions

File tree

‎CHANGES.md‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
generated by [japicmp](https://siom79.github.io/japicmp) are published at
99
[https://apache.github.io/mina-sshd](https://apache.github.io/mina-sshd).
1010

11-
Version 3 includes all the features and bug fixes of version 2, including the
12-
[latest ones](https://github.com/apache/mina-sshd/blob/master/CHANGES.md#planned-for-next-version).
11+
Version 3 includes all the features and bug fixes of [version 2.17.1](./docs/changes/2.17.1.md) and up to
12+
[commit a3d22510](https://github.com/apache/mina-sshd/blob/a3d22510/CHANGES.md#planned-for-next-version).
1313

1414
* For building Apache MINA SSHD 3.0, **Java >= 24** and Apache **Maven >= 3.9.12** are required. Generated artifacts
1515
still use Java 8 as minimum runtime requirement.
@@ -27,16 +27,12 @@ newer Java versions the already built-in cryptographic algorithms for ChaCha20,
2727

2828
* [Change notes for 3.0.0-M2](./docs/changes/3.0.0-M2.md)
2929

30-
# Planned for the Next Milestone Release
30+
## Milestone 3: Pre-Release 3.0.0-M3
3131

32+
This is a minor update to bring the improvements done in 2.17.x into the 3.0.0 stream. Besides that,
33+
there are only two bug fixes from 3.0.0-M2:
3234

33-
## Bug Fixes
35+
### Bug Fixes
3436

35-
* [GH-852](https://github.com/apache/mina-sshd/issues/852) Fix wrong import
37+
* [GH-852](https://github.com/apache/mina-sshd/issues/852) (Bug in 3.0.0-M2) Fix wrong import
3638
* [GH-891](https://github.com/apache/mina-sshd/issues/891) (Regression in 3.0.0-M1) Fix format of injected SSH_MSG_IGNORE
37-
38-
## Major Code Re-factoring
39-
40-
41-
## New Features
42-

‎docs/changes/version2.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,5 @@
2121
* [Version 2.13.2 to 2.14.0](./2.14.0.md)
2222
* [Version 2.14.0 to 2.15.0](./2.15.0.md)
2323
* [Version 2.15.0 to 2.16.0](./2.16.0.md)
24+
* [Version 2.16.0 to 2.17.0](./2.17.0.md)
25+
* [Version 2.17.0 to 2.17.1](./2.17.1.md)

‎sshd-git/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,6 @@
150150
<plugin>
151151
<groupId>org.apache.maven.plugins</groupId>
152152
<artifactId>maven-javadoc-plugin</artifactId>
153-
<configuration>
154-
<additionalparam>-Xdoclint:none</additionalparam>
155-
</configuration>
156153
</plugin>
157154
</plugins>
158155
</build>

‎sshd-ldap/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,6 @@
146146
<plugin>
147147
<groupId>org.apache.maven.plugins</groupId>
148148
<artifactId>maven-javadoc-plugin</artifactId>
149-
<configuration>
150-
<additionalparam>-Xdoclint:none</additionalparam>
151-
</configuration>
152149
</plugin>
153150
</plugins>
154151
</build>

‎sshd-mina/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,6 @@
179179
<plugin>
180180
<groupId>org.apache.maven.plugins</groupId>
181181
<artifactId>maven-javadoc-plugin</artifactId>
182-
<configuration>
183-
<additionalparam>-Xdoclint:none</additionalparam>
184-
</configuration>
185182
</plugin>
186183
</plugins>
187184
</build>

‎sshd-netty/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,6 @@
157157
<plugin>
158158
<groupId>org.apache.maven.plugins</groupId>
159159
<artifactId>maven-javadoc-plugin</artifactId>
160-
<configuration>
161-
<additionalparam>-Xdoclint:none</additionalparam>
162-
</configuration>
163160
</plugin>
164161
</plugins>
165162
</build>

‎sshd-scp/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,6 @@
112112
<plugin>
113113
<groupId>org.apache.maven.plugins</groupId>
114114
<artifactId>maven-javadoc-plugin</artifactId>
115-
<configuration>
116-
<additionalparam>-Xdoclint:none</additionalparam>
117-
</configuration>
118115
</plugin>
119116
</plugins>
120117
</build>

‎sshd-sftp/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,6 @@
124124
<plugin>
125125
<groupId>org.apache.maven.plugins</groupId>
126126
<artifactId>maven-javadoc-plugin</artifactId>
127-
<configuration>
128-
<additionalparam>-Xdoclint:none</additionalparam>
129-
</configuration>
130127
</plugin>
131128
</plugins>
132129
</build>

‎sshd-site/src/site/markdown/index.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ But we can give you a rough outline of what we want to do:
4747
* **3.0.0-M2**: Refactoring of cryptography. New feature: multi-release JARs for `sshd-common`
4848
and `sshd-osgi` and using on newer Java versions the already built-in cryptographic algorithms
4949
for ChaCha20, ed25519, and ML-KEM.
50+
* **3.0.0-M3**: Bug fix release of 3.0.0-M2, and update base to 2.17.1.
5051

5152
Further possible milestones (the order might change, though):
5253

‎sshd-spring-sftp/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,6 @@
112112
<plugin>
113113
<groupId>org.apache.maven.plugins</groupId>
114114
<artifactId>maven-javadoc-plugin</artifactId>
115-
<configuration>
116-
<additionalparam>-Xdoclint:none</additionalparam>
117-
</configuration>
118115
</plugin>
119116
</plugins>
120117
</build>

0 commit comments

Comments
 (0)