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 0eab72466dc651918677a2a400883ecab6687306
Author: Thomas Wolf <tw...@apache.org>
AuthorDate: Wed Apr 23 12:54:33 2025 +0200
[releng] Work around impsort plugin problem
When building on windows, the impsort plugin gets thrown off by the
comment just before the imports in BCrypt.java if the file as checked
out uses plain LF line endings.
It somehow insists on changing the 2nd of the three lines by adding a
CRLF line ending, and claims that 1 file needed sorting, even though
the file is left unchanged otherwise.
No idea why, but in any case the problem can be avoided by moving the
comment to before the package declaration.
---
.../apache/sshd/common/config/keys/loader/openssh/kdf/BCrypt.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git
a/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/openssh/kdf/BCrypt.java
b/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/openssh/kdf/BCrypt.java
index d84dd0e1e..e878731b1 100644
---
a/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/openssh/kdf/BCrypt.java
+++
b/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/openssh/kdf/BCrypt.java
@@ -14,12 +14,13 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-// CHECKSTYLE:OFF
-package org.apache.sshd.common.config.keys.loader.openssh.kdf;
-
// This code comes from
https://github.com/kruton/jbcrypt/blob/37a5a77/jbcrypt/src/main/java/org/mindrot/jbcrypt/BCrypt.java
.
// It's available on maven as artifact org.connectbot.jbcrypt:jbcrypt:1.0.0.
pbkdf method added 2016 by Kenny Root.
// Modifications for Apache MINA sshd: this comment, plus changed the package
from org.mindrot.jbcrypt to avoid conflicts.
+
+// CHECKSTYLE:OFF
+package org.apache.sshd.common.config.keys.loader.openssh.kdf;
+
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.security.DigestException;
