Upgraded Checkstyle version to 8.12
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/288052b6 Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/288052b6 Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/288052b6 Branch: refs/heads/master Commit: 288052b6ea9b2b8071cc5fd471414b7108019577 Parents: d296fd6 Author: Goldstein Lyor <[email protected]> Authored: Wed Aug 22 11:36:52 2018 +0300 Committer: Goldstein Lyor <[email protected]> Committed: Wed Aug 22 12:53:33 2018 +0300 ---------------------------------------------------------------------- pom.xml | 8 ++++---- .../org/apache/sshd/client/config/hosts/HostConfigEntry.java | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/288052b6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5bac023..99fe49e 100644 --- a/pom.xml +++ b/pom.xml @@ -335,12 +335,12 @@ <version>${groovy.version}</version> </dependency> <!-- NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE - + Upgrading it beyond 2.0.19 causes problems for the sshd-ldap since the Apache DS server used to run the unit tests fails in LdapProtocolHandler#messageReceived due to the fact that the SslFilter#SESSION_SECURED has been moved in version 2.0.18. - + See https://issues.apache.org/jira/browse/DIRMINA-1087 --> <dependency> @@ -490,7 +490,7 @@ <artifactId>byte-buddy-agent</artifactId> <version>${bytebuddy.version}</version> </dependency> - + <dependency> <groupId>net.sf.jpam</groupId> <artifactId>jpam</artifactId> @@ -683,7 +683,7 @@ <dependency> <groupId>com.puppycrawl.tools</groupId> <artifactId>checkstyle</artifactId> - <version>8.11</version> + <version>8.12</version> <exclusions> <!-- MCHECKSTYLE-156 --> <exclusion> http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/288052b6/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostConfigEntry.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostConfigEntry.java b/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostConfigEntry.java index 3711e45..bf22b87 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostConfigEntry.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostConfigEntry.java @@ -1104,8 +1104,7 @@ public class HostConfigEntry extends HostPatternsHolder implements MutableUserHo case LOCAL_USER_MACRO: sb.append(ValidateUtils.checkNotNullAndNotEmpty(OsUtils.getCurrentUser(), "No local user name value")); break; - case LOCAL_HOST_MACRO: - { + case LOCAL_HOST_MACRO: { InetAddress address = Objects.requireNonNull(InetAddress.getLocalHost(), "No local address"); sb.append(ValidateUtils.checkNotNullAndNotEmpty(address.getHostName(), "No local name")); break;
