svn commit: r1621653 - in /hive/trunk: checkstyle/checkstyle.xml pom.xml

[ha...@apache.org]

Author: hashutosh
Date: Mon Sep  1 01:37:29 2014
New Revision: 1621653

URL: http://svn.apache.org/r1621653
Log:
HIVE-6123 : Implement checkstyle in maven (Lars Francke via Ashutosh Chauhan)

Modified:
    hive/trunk/checkstyle/checkstyle.xml
    hive/trunk/pom.xml

Modified: hive/trunk/checkstyle/checkstyle.xml
URL: http://svn.apache.org/viewvc/hive/trunk/checkstyle/checkstyle.xml?rev=1621653&r1=1621652&r2=1621653&view=diff
==============================================================================
--- hive/trunk/checkstyle/checkstyle.xml (original)
+++ hive/trunk/checkstyle/checkstyle.xml Mon Sep  1 01:37:29 2014
@@ -65,7 +65,7 @@
   <module name="Translation"/>
 
   <module name="Header">
-    <property name="headerFile" value="${basedir}/checkstyle/asf.header"/>
+    <property name="headerFile" value="checkstyle/asf.header"/>
   </module>
 
   <!-- Maximum file line length -->
@@ -78,7 +78,7 @@
 
   <!-- List of files to ignore -->
   <module name="SuppressionFilter">
-    <property name="file" value="${basedir}/checkstyle/suppressions.xml"/>
+    <property name="file" value="checkstyle/suppressions.xml"/>
   </module>
 
   <!-- Ignore JavaCC/JJTree files -->
@@ -178,7 +178,6 @@
     <!-- Checks for common coding problems               -->
     <!-- See http://checkstyle.sf.net/config_coding.html -->
     <!-- module name="AvoidInlineConditionals"/-->
-    <module name="DoubleCheckedLocking"/>
     <module name="EmptyStatement"/>
     <module name="EqualsAvoidNull"/>
     <module name="EqualsHashCode"/>

Modified: hive/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/pom.xml?rev=1621653&r1=1621652&r2=1621653&view=diff
==============================================================================
--- hive/trunk/pom.xml (original)
+++ hive/trunk/pom.xml Mon Sep  1 01:37:29 2014
@@ -60,6 +60,7 @@
     <maven.repo.local>${settings.localRepository}</maven.repo.local>
     <hive.path.to.root>.</hive.path.to.root>
     <hive.jdbc.driver.classifier>standalone</hive.jdbc.driver.classifier>
+    <checkstyle.conf.dir>${hive.path.to.root}/checkstyle</checkstyle.conf.dir>
 
     <!-- Test Properties -->
     <test.extra.path></test.extra.path>
@@ -75,6 +76,7 @@
     <datanucleus.maven.plugin.version>3.3.0-release</datanucleus.maven.plugin.version>
     <maven.antrun.plugin.version>1.7</maven.antrun.plugin.version>
     <maven.assembly.plugin.version>2.3</maven.assembly.plugin.version>
+    <maven.checkstyle.plugin.version>2.12.1</maven.checkstyle.plugin.version>
     <maven.compiler.plugin.version>3.1</maven.compiler.plugin.version>
     <maven.enforcer.plugin.version>1.3.1</maven.enforcer.plugin.version>
     <maven.install.plugin.version>2.4</maven.install.plugin.version>
@@ -616,6 +618,11 @@
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-checkstyle-plugin</artifactId>
+          <version>${maven.checkstyle.plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-enforcer-plugin</artifactId>
           <version>${maven.enforcer.plugin.version}</version>
         </plugin>
@@ -745,6 +752,13 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <configuration>
+          <configLocation>${checkstyle.conf.dir}/checkstyle.xml</configLocation>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <excludes>