Repository: mina-sshd Updated Branches: refs/heads/master ad93f723e -> 9be86826c
Upgraded used checkstyle version to 8.3 Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/9be86826 Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/9be86826 Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/9be86826 Branch: refs/heads/master Commit: 9be86826c42f7e1dc2a347c35d172d2ef1a6af8a Parents: ad93f72 Author: Lyor Goldstein <lyor.goldst...@gmail.com> Authored: Tue Oct 17 20:20:09 2017 +0300 Committer: Lyor Goldstein <lyor.goldst...@gmail.com> Committed: Tue Oct 17 20:20:09 2017 +0300 ---------------------------------------------------------------------- pom.xml | 2 +- sshd-checkstyle.xml | 3 ++- .../src/test/java/org/apache/sshd/spring/SpringConfigTest.java | 1 + sshd-core/src/test/java/org/apache/sshd/util/test/JSchLogger.java | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9be86826/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 483cda1..0685593 100644 --- a/pom.xml +++ b/pom.xml @@ -607,7 +607,7 @@ <dependency> <groupId>com.puppycrawl.tools</groupId> <artifactId>checkstyle</artifactId> - <version>8.2</version> + <version>8.3</version> <exclusions> <!-- MCHECKSTYLE-156 --> <exclusion> http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9be86826/sshd-checkstyle.xml ---------------------------------------------------------------------- diff --git a/sshd-checkstyle.xml b/sshd-checkstyle.xml index 0f5c66f..0a5aa77 100644 --- a/sshd-checkstyle.xml +++ b/sshd-checkstyle.xml @@ -73,6 +73,7 @@ <module name="ImportOrder"> <property name="groups" value="java,javax,org.w3c,org.xml,junit,antlr,com.,net,org,*" /> <property name="ordered" value="true" /> + <property name="separated" value="true" /> </module> <!-- @@ -109,7 +110,7 @@ <module name="EmptyForInitializerPad" /> <module name="MethodParamPad" /> <module name="NoWhitespaceAfter"> - <property name="tokens" value="ARRAY_INIT,BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS" /> + <property name="tokens" value="ARRAY_INIT,BNOT,DEC,DOT,INC,AT,LNOT,UNARY_MINUS,UNARY_PLUS" /> </module> <module name="EmptyLineSeparator"> <property name="tokens" value="IMPORT,CLASS_DEF,INTERFACE_DEF,STATIC_INIT,INSTANCE_INIT,METHOD_DEF,CTOR_DEF" /> http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9be86826/sshd-core/src/test/java/org/apache/sshd/spring/SpringConfigTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/spring/SpringConfigTest.java b/sshd-core/src/test/java/org/apache/sshd/spring/SpringConfigTest.java index 76c9534..3501208 100644 --- a/sshd-core/src/test/java/org/apache/sshd/spring/SpringConfigTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/spring/SpringConfigTest.java @@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit; import com.jcraft.jsch.Channel; import com.jcraft.jsch.JSch; + import org.apache.sshd.common.util.OsUtils; import org.apache.sshd.server.SshServer; import org.apache.sshd.util.test.BaseTestSupport; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9be86826/sshd-core/src/test/java/org/apache/sshd/util/test/JSchLogger.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/util/test/JSchLogger.java b/sshd-core/src/test/java/org/apache/sshd/util/test/JSchLogger.java index bf84bff..09124c1 100644 --- a/sshd-core/src/test/java/org/apache/sshd/util/test/JSchLogger.java +++ b/sshd-core/src/test/java/org/apache/sshd/util/test/JSchLogger.java @@ -20,6 +20,7 @@ package org.apache.sshd.util.test; import com.jcraft.jsch.JSch; import com.jcraft.jsch.Logger; + import org.slf4j.LoggerFactory; /**