[calcite] branch master updated: [CALCITE-2788] Building error for sub-project of calcite on "maven-checkstyle-plugin"

[mmior]

This is an automated email from the ASF dual-hosted git repository.

mmior pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git


The following commit(s) were added to refs/heads/master by this push:
     new 0202ef5  [CALCITE-2788]  Building error for sub-project of calcite on 
"maven-checkstyle-plugin"
0202ef5 is described below

commit 0202ef59519eda6d4c416d84544e152304849715
Author: pengzhiwei <pengzhiwei2...@icloud.com>
AuthorDate: Wed Jan 16 21:15:22 2019 +0800

    [CALCITE-2788]  Building error for sub-project of calcite on 
"maven-checkstyle-plugin"
---
 pom.xml                                | 1 +
 src/main/config/checkstyle/checker.xml | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 155395e..64a1dcd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -736,6 +736,7 @@ limitations under the License.
             <configuration>
               
<configLocation>${top.dir}/src/main/config/checkstyle/checker.xml</configLocation>
               
<suppressionsLocation>${top.dir}/src/main/config/checkstyle/suppressions.xml</suppressionsLocation>
+              <propertyExpansion>base_dir=${top.dir}</propertyExpansion>
               <consoleOutput>true</consoleOutput>
               <failOnViolation>true</failOnViolation>
               <includeTestSourceDirectory>true</includeTestSourceDirectory>
diff --git a/src/main/config/checkstyle/checker.xml 
b/src/main/config/checkstyle/checker.xml
index 444e46f..f07529e 100644
--- a/src/main/config/checkstyle/checker.xml
+++ b/src/main/config/checkstyle/checker.xml
@@ -36,15 +36,15 @@ limitations under the License.
   <!-- See http://checkstyle.sf.net/config_header.html -->
     <!-- Verify that EVERY source file has the appropriate license -->
   <module name="Header">
-    <property name="headerFile" 
value="src/main/config/checkstyle/header.java.txt"/>
+    <property name="headerFile" 
value="${base_dir}/src/main/config/checkstyle/header.java.txt"/>
     <property name="fileExtensions" value="cql,java,jj,json,kt"/>
   </module>
   <module name="Header">
-    <property name="headerFile" 
value="src/main/config/checkstyle/header.properties.txt"/>
+    <property name="headerFile" 
value="${base_dir}/src/main/config/checkstyle/header.properties.txt"/>
     <property name="fileExtensions" value="properties"/>
   </module>
   <module name="Header">
-    <property name="headerFile" 
value="src/main/config/checkstyle/header.xml.txt"/>
+    <property name="headerFile" 
value="${base_dir}/src/main/config/checkstyle/header.xml.txt"/>
     <property name="fileExtensions" value="xml"/>
   </module>