Update CheckStyle (#75)

1. Move to updated google-checks.xml (remove the old one)
2. Tell check style to use v8.1 (instead of 6.11.2)
3. remove versions-rules
4. comment out our amendments for now in google_checks.xml
5. Fix AppTest for new check style rules.
6. update a few versions
7. prep for two new releases

Author: lesv

checkstyle-config/pom.xml

@@ -18,7 +18,7 @@ limitations under the License.
 
   <groupId>com.google.cloud.samples</groupId>
   <artifactId>checkstyle-configuration</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.0.1</version>
   <packaging>jar</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>
@@ -78,14 +78,10 @@ limitations under the License.
 
     <maven-release-plugin>2.5.3</maven-release-plugin>
     <nexus-staging-maven-plugin>1.6.8</nexus-staging-maven-plugin>
-    <versions-maven-plugin>2.3</versions-maven-plugin>
+    <versions-maven-plugin>2.4</versions-maven-plugin>
     <maven-gpg-plugin>1.6</maven-gpg-plugin>
   </properties>
 
-  <prerequisites>
-    <maven>3.5.0</maven>
-  </prerequisites>
-
   <profiles>
     <!-- Code signing for release: http://stackoverflow.com/a/14869692/101923 -->
     <profile>
@@ -141,7 +137,28 @@ limitations under the License.
         </plugin>
       </plugins>
     </pluginManagement>
+
     <plugins>
+
+      <plugin>
+        <groupId>com.coderplus.maven.plugins</groupId>
+        <artifactId>copy-rename-maven-plugin</artifactId>
+        <version>1.0.1</version>
+        <executions>
+          <execution>
+            <id>copy-resources</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <sourceFile>../third_party/checkstyle/google_checks.xml</sourceFile>
+              <destinationFile>target/classes/google-checks.xml</destinationFile>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>versions-maven-plugin</artifactId>

checkstyle-config/src/main/resources/google-checks.xml

@@ -18,7 +18,7 @@ limitations under the License.
 
   <groupId>com.google.cloud.samples</groupId>
   <artifactId>shared-configuration</artifactId>
-  <version>1.0.5-SNAPSHOT</version>
+  <version>1.0.5</version>
   <packaging>pom</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>
@@ -59,7 +59,7 @@ limitations under the License.
     <connection>scm:git:[email protected]:GoogleCloudPlatform/java-repo-tools.git</connection>
     <developerConnection>scm:git:[email protected]:GoogleCloudPlatform/java-repo-tools.git</developerConnection>
     <url>[email protected]:GoogleCloudPlatform/java-repo-tools.git</url>
-    <tag>v1.0.4-alpha</tag>
+    <tag>v1.0.5</tag>
   </scm>
 
   <distributionManagement>
@@ -102,10 +102,6 @@ limitations under the License.
     <maven-gpg-plugin>1.6</maven-gpg-plugin>
   </properties>
 
-  <prerequisites>
-    <maven>3.5.0</maven>
-  </prerequisites>
-
   <profiles>
     <!-- Code signing for release: http://stackoverflow.com/a/14869692/101923 -->
     <profile>
@@ -211,18 +207,25 @@ limitations under the License.
           <configLocation>google-checks.xml</configLocation>
           <consoleOutput>true</consoleOutput>
           <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
           <includeTestSourceDirectory>true</includeTestSourceDirectory>
           <suppressionsLocation>suppressions.xml</suppressionsLocation>
         </configuration>
         <dependencies>
           <!-- Add a dependency to use bundled resources.
                See: http://stackoverflow.com/a/19690484/101923 -->
+
           <dependency>
             <groupId>com.google.cloud.samples</groupId>
             <artifactId>checkstyle-configuration</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1</version>
+          </dependency>
+
+          <dependency>
+            <groupId>com.puppycrawl.tools</groupId>
+            <artifactId>checkstyle</artifactId>
+            <version>8.1</version>
           </dependency>
+
         </dependencies>
         <executions>
           <execution><goals><goal>check</goal></goals></execution>

pom.xml

@@ -26,13 +26,13 @@ limitations under the License.
   <parent>
     <artifactId>shared-configuration</artifactId>
     <groupId>com.google.cloud.samples</groupId>
-    <version>1.0.5-SNAPSHOT</version>
+    <version>1.0.5</version>
     <relativePath>..</relativePath>
   </parent>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source> <!-- REQUIRED -->
-    <maven.compiler.target>1.7</maven.compiler.target> <!-- REQUIRED -->
+    <maven.compiler.source>1.8</maven.compiler.source> <!-- REQUIRED -->
+    <maven.compiler.target>1.8</maven.compiler.target> <!-- REQUIRED -->
   </properties>
 
   <dependencies>

test/pom.xml

@@ -18,12 +18,13 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
 
 /**
  * Unit tests for {@link App}.

test/src/test/java/com/google/cloud/samples/test/AppTest.java

@@ -15,5 +15,5 @@ third_party {
   }
   version: "8.0"
   last_upgrade_date { year: 2017 month: 7 day: 24 }
-  local_modifications: "Initial checkin."
+  local_modifications: "SuppressWarningsFilter & SuppressionCommentFilter"
 }

third_party/checkstyle/METADATA

@@ -231,5 +231,15 @@
             <property name="exceptionVariableName" value="expected"/>
         </module>
         <module name="CommentsIndentation"/>
+      <!-- rules for DPE GH projects -->
+      <!-- Allow silencing rules with annotations http://stackoverflow.com/a/22556386/101923 -->
+<!--
+      <module name="SuppressWarningsFilter" />
+ -->
+      <!-- Allow silencing with comment http://stackoverflow.com/questions/4023185 -->
+<!--
+      <module name="SuppressionCommentFilter" />
+ -->
     </module>
+
 </module>