You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by lg...@apache.org on 2020/05/04 16:01:41 UTC
[mina-sshd] branch master updated: [SSHD-978] Updated source
formatter plugin configuration
This is an automated email from the ASF dual-hosted git repository.
lgoldstein pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new 160703e [SSHD-978] Updated source formatter plugin configuration
160703e is described below
commit 160703e311279cf0b40e51871cb56d35b0ce6b78
Author: Lyor Goldstein <lg...@apache.org>
AuthorDate: Mon May 4 18:48:31 2020 +0300
[SSHD-978] Updated source formatter plugin configuration
---
pom.xml | 13 +++++++++----
.../sshd/common/config/keys/loader/openssh/kdf/BCrypt.java | 4 ++--
sshd-core/pom.xml | 11 +++++++++++
3 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1936f8a..5ae7540 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1030,6 +1030,15 @@
-->
</dependencies>
</plugin>
+ <plugin>
+ <groupId>net.revelc.code.formatter</groupId>
+ <artifactId>formatter-maven-plugin</artifactId>
+ <version>2.11.0</version>
+ <configuration>
+ <configFile>${workspace.root.dir}${file.separator}sshd-eclipse-formatter-config.xml</configFile>
+ <lineEnding>LF</lineEnding>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
@@ -1072,10 +1081,6 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
- <version>2.11.0</version>
- <configuration>
- <configFile>${workspace.root.dir}${file.separator}sshd-eclipse-formatter-config.xml</configFile>
- </configuration>
<executions>
<execution>
<id>format</id>
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 f5a2834..20a8b76 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
@@ -17,8 +17,8 @@
// 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.
+// 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.
import java.io.UnsupportedEncodingException;
import java.security.DigestException;
diff --git a/sshd-core/pom.xml b/sshd-core/pom.xml
index 0efeaf6..2dfe7ba 100644
--- a/sshd-core/pom.xml
+++ b/sshd-core/pom.xml
@@ -135,6 +135,17 @@
</resource>
</resources>
<plugins>
+ <plugin>
+ <groupId>net.revelc.code.formatter</groupId>
+ <artifactId>formatter-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- For some reason the plugin splits the standard
+ license header to extra blank lines -->
+ <exclude>src/test/java/org/apache/sshd/deprecated</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
<!-- publish the test-jar since it contains some classes used by other
artifacts tests -->
<plugin>