AVRO-1838: Java: Update checkstyle to catch trailing whitespace. Cont…

…ributed by Niels Basjes.
kaaproject · May 8, 2016 · 02f623b · 02f623b
1 parent 7e10bab
commit 02f623b
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 157 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -35,6 +35,9 @@ Trunk (not yet released)
 
     AVRO-1839: Update the gitignore files to hide generated files (nielsbasjes)
 
+    AVRO-1838: Java: Update checkstyle to catch trailing whitespace.
+    (nielsbasjes via blue)
+
   BUG FIXES
 
     AVRO-1493. Java: Avoid the "Turkish Locale Problem". Schema fingerprints are

diff --git a/lang/java/checkstyle.xml b/lang/java/checkstyle.xml
diff --git a/lang/java/pom.xml b/lang/java/pom.xml
@@ -74,7 +74,6 @@
     <findbugs-annotations.version>1.3.9-1</findbugs-annotations.version>
 
     <!-- version properties for plugins -->
-    <checkstyle-plugin.version>2.12.1</checkstyle-plugin.version>
     <bundle-plugin-version>2.5.3</bundle-plugin-version>
     <compiler-plugin.version>3.1</compiler-plugin.version>
     <exec-plugin.version>1.3.2</exec-plugin.version>
@@ -234,27 +233,6 @@
             </systemPropertyVariables>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>${checkstyle-plugin.version}</version>
-          <configuration>
-            <consoleOutput>true</consoleOutput>
-            <configLocation>checkstyle.xml</configLocation>
-          </configuration>
-          <!-- Runs by default in the verify phase  (mvn verify or later in the build cycle)
-               the 'check' goal will fail the build if it does not pass.  "mvn checkstyle:check"
-               will do this alone, or "mvn checkstyle:checkstyle" will report but not break  -->
-          <executions>
-            <execution>
-              <id>checkstyle-check</id>
-              <phase>test</phase>
-              <goals>
-                <goal>check</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
@@ -307,10 +285,6 @@
       </plugins>
     </pluginManagement>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>

diff --git a/lang/java/trevni/avro/pom.xml b/lang/java/trevni/avro/pom.xml
@@ -48,10 +48,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>

diff --git a/lang/java/trevni/checkstyle.xml b/lang/java/trevni/checkstyle.xml
diff --git a/lang/java/trevni/core/pom.xml b/lang/java/trevni/core/pom.xml
@@ -44,15 +44,6 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
   <profiles>
   </profiles>
 

diff --git a/pom.xml b/pom.xml
@@ -44,6 +44,7 @@
        Java artifacts are copied to the final build destination with a custom profile.
        -->
   <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <avro.distDir>dist</avro.distDir>
     <avro.docDir>build/avro-doc-${project.version}/api</avro.docDir>
     <!-- dependency plugin versions -->
@@ -53,9 +54,11 @@
     <antrun-plugin.version>1.7</antrun-plugin.version>
     <enforcer-plugin.version>1.3.1</enforcer-plugin.version>
     <rat.version>0.9</rat.version>
+    <checkstyle-plugin.version>2.17</checkstyle-plugin.version>
   </properties>
 
   <modules>
+    <module>dev-tools</module>
     <module>lang/java</module>
   </modules>
 
@@ -118,6 +121,35 @@
           <fail>true</fail>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>${checkstyle-plugin.version}</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.avro</groupId>
+            <artifactId>dev-tools</artifactId>
+            <version>${project.version}</version>
+          </dependency>
+        </dependencies>
+        <configuration>
+          <consoleOutput>true</consoleOutput>
+          <configLocation>checkstyle/checkstyle.xml</configLocation>
+          <suppressionsLocation>checkstyle/suppressions.xml</suppressionsLocation>
+        </configuration>
+        <!-- Runs by default in the verify phase  (mvn verify or later in the build cycle)
+             the 'check' goal will fail the build if it does not pass.  "mvn checkstyle:check"
+             will do this alone, or "mvn checkstyle:checkstyle" will report but not break  -->
+        <executions>
+          <execution>
+            <id>checkstyle-check</id>
+            <phase>test</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>