Repository: kudu Updated Branches: refs/heads/master 750b8979c -> f5274584a
Fix checkstyle suppressions in submodule builds Removes the use of relative paths via âsamedir=.â in the checkstyle plugin to allow executing maven builds from submodule directories. Previously this would result in a failure to find the suppressions xml file. Change-Id: I75c5ae0cb5fcc468d15139619c113d2a67b024f7 Reviewed-on: http://gerrit.cloudera.org:8080/6060 Tested-by: Kudu Jenkins Reviewed-by: Mike Percy <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/f5274584 Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/f5274584 Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/f5274584 Branch: refs/heads/master Commit: f5274584ac422172936e8d12ba0eebada374b8d7 Parents: 750b897 Author: Grant Henke <[email protected]> Authored: Fri Feb 17 12:37:33 2017 -0600 Committer: Mike Percy <[email protected]> Committed: Mon Feb 20 19:05:25 2017 +0000 ---------------------------------------------------------------------- java/kudu_style.xml | 2 +- java/pom.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kudu/blob/f5274584/java/kudu_style.xml ---------------------------------------------------------------------- diff --git a/java/kudu_style.xml b/java/kudu_style.xml index 9694462..d0b8d6c 100644 --- a/java/kudu_style.xml +++ b/java/kudu_style.xml @@ -51,7 +51,7 @@ <module name="SuppressionCommentFilter"/> <!-- Suppress generated sources --> <module name="SuppressionFilter"> - <property name="file" value="${samedir}/checkstyle_suppressions.xml"/> + <property name="file" value="${checkstyle.suppressions.file}"/> <property name="optional" value="false"/> </module> <module name="TreeWalker"> http://git-wip-us.apache.org/repos/asf/kudu/blob/f5274584/java/pom.xml ---------------------------------------------------------------------- diff --git a/java/pom.xml b/java/pom.xml index 8de6a72..3c865b6 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -256,7 +256,8 @@ <phase>validate</phase> <configuration> <configLocation>kudu_style.xml</configLocation> - <propertyExpansion>samedir=.</propertyExpansion> + <suppressionsLocation>checkstyle_suppressions.xml</suppressionsLocation> + <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression> <encoding>UTF-8</encoding> <consoleOutput>true</consoleOutput> <failsOnError>false</failsOnError>
