Repository: mina-sshd Updated Branches: refs/heads/master 4ab663795 -> 20695fddf
Use the same checkstyle suppression file in both Eclipse and Maven build Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/20695fdd Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/20695fdd Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/20695fdd Branch: refs/heads/master Commit: 20695fddf286716cf18a807678fcacc5f3dd4451 Parents: 4ab6637 Author: Goldstein Lyor <[email protected]> Authored: Thu Oct 4 14:47:27 2018 +0300 Committer: Lyor Goldstein <[email protected]> Committed: Thu Oct 4 19:24:30 2018 +0300 ---------------------------------------------------------------------- .gitignore | 1 - pom.xml | 6 ++++-- sshd-checkstyle.xml | 6 ++++++ 3 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/20695fdd/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 58e8460..f0a63bd 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,3 @@ RemoteSystemsTempFiles/ .springBeans .externalToolBuilders *.ser - http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/20695fdd/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 525e2ba..f8818aa 100644 --- a/pom.xml +++ b/pom.xml @@ -895,7 +895,9 @@ <configuration> <configLocation>${workspace.root.dir}${file.separator}sshd-checkstyle.xml</configLocation> <headerLocation>${workspace.root.dir}${file.separator}java-checkstyle-license-header.txt</headerLocation> - <suppressionsLocation>${workspace.root.dir}${file.separator}sshd-checkstyle-suppressions.xml</suppressionsLocation> + <!-- '{samedir}' is an Eclipse built in environment variable initialized with the value of the external checkstyle configuration file --> + <!-- See See https://checkstyle.org/eclipse-cs/#!/properties --> + <propertyExpansion>samedir=${workspace.root.dir}</propertyExpansion> <includeTestSourceDirectory>true</includeTestSourceDirectory> </configuration> <executions> @@ -968,7 +970,7 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> + <artifactId>maven-clean-plugin</artifactId> <executions> <!-- Delete temporary serialized key files generated during tests run --> <execution> http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/20695fdd/sshd-checkstyle.xml ---------------------------------------------------------------------- diff --git a/sshd-checkstyle.xml b/sshd-checkstyle.xml index 649e5e2..3d90a2d 100644 --- a/sshd-checkstyle.xml +++ b/sshd-checkstyle.xml @@ -315,4 +315,10 @@ <module name="FileTabCharacter"> <property name="eachLine" value="true" /> </module> + <!-- '{samedir}' is an Eclipse built in environment variable initialized with the value of the external checkstyle configuration file --> + <!-- See https://checkstyle.org/eclipse-cs/#!/properties --> + <module name="SuppressionFilter"> + <property name="file" value="${samedir}/sshd-checkstyle-suppressions.xml"/> + <property name="optional" value="true"/> + </module> </module>
