From 2384e51a4d0801a992da518709cec27b13d2bb23 Mon Sep 17 00:00:00 2001
From: Tim Swast <swast@google.com>
Date: Mon, 29 Feb 2016 17:18:04 -0800
Subject: [PATCH] Remove redundant checkstyle plugin definitions.

The submodules do not need checkstyle plugin defined if they define the
parent.
---
 appengine/appidentity/pom.xml                 | 21 +++++---------
 appengine/helloworld/pom.xml                  | 20 ++++---------
 bigquery/pom.xml                              | 15 ----------
 datastore/pom.xml                             | 26 ++++++++---------
 logging/pom.xml                               | 14 ----------
 managed_vms/analytics/pom.xml                 | 24 ++++++----------
 managed_vms/async-rest/pom.xml                |  2 +-
 managed_vms/cloudsql/pom.xml                  | 24 ++++++----------
 managed_vms/cloudstorage/pom.xml              | 24 ++++++----------
 managed_vms/datastore/pom.xml                 | 28 ++++++-------------
 managed_vms/disk/pom.xml                      | 24 ++++++----------
 managed_vms/extending-runtime/pom.xml         | 24 ++++++----------
 managed_vms/helloworld/pom.xml                | 23 ++++++---------
 managed_vms/mailgun/pom.xml                   | 24 ++++++----------
 managed_vms/memcache/pom.xml                  | 24 ++++++----------
 managed_vms/sendgrid/pom.xml                  | 24 ++++++----------
 managed_vms/sparkjava/pom.xml                 | 24 ++++++----------
 managed_vms/static-files/pom.xml              | 24 ++++++----------
 managed_vms/twilio/pom.xml                    | 24 ++++++----------
 monitoring/pom.xml                            | 14 ----------
 pom.xml                                       | 10 +++----
 storage/json-api/pom.xml                      | 14 ----------
 storage/storage-transfer/pom.xml              | 16 +----------
 storage/xml-api/cmdline-sample/pom.xml        | 18 +-----------
 .../serviceaccount-appengine-sample/pom.xml   | 16 +----------
 taskqueue/deferred/pom.xml                    | 18 ++----------
 unittests/pom.xml                             | 17 +----------
 27 files changed, 153 insertions(+), 383 deletions(-)

diff --git a/appengine/appidentity/pom.xml b/appengine/appidentity/pom.xml
index 6117fce98c9..033681074f4 100644
--- a/appengine/appidentity/pom.xml
+++ b/appengine/appidentity/pom.xml
@@ -22,6 +22,13 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <groupId>com.example.appengine</groupId>
   <artifactId>appengine-appidentity</artifactId>
 
+  <parent>
+    <groupId>com.google.cloud</groupId>
+    <artifactId>doc-samples</artifactId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
   <properties>
     <appengine.target.version>1.9.30</appengine.target.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -107,20 +114,6 @@ Copyright 2015 Google Inc. All Rights Reserved.
         <artifactId>gcloud-maven-plugin</artifactId>
         <version>2.0.9.90.v20151210</version>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution><goals><goal>check</goal></goals></execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/appengine/helloworld/pom.xml b/appengine/helloworld/pom.xml
index b415238fcf3..03bf096d105 100644
--- a/appengine/helloworld/pom.xml
+++ b/appengine/helloworld/pom.xml
@@ -21,6 +21,12 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
   <artifactId>appengine-helloworld</artifactId>
+  <parent>
+    <groupId>com.google.cloud</groupId>
+    <artifactId>doc-samples</artifactId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -48,20 +54,6 @@ Copyright 2015 Google Inc. All Rights Reserved.
         <artifactId>appengine-maven-plugin</artifactId>
         <version>1.9.31</version>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution><goals><goal>check</goal></goals></execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/bigquery/pom.xml b/bigquery/pom.xml
index 717de4e2d23..df882ba47f3 100644
--- a/bigquery/pom.xml
+++ b/bigquery/pom.xml
@@ -12,7 +12,6 @@
     <relativePath>..</relativePath>
   </parent>
 
-
   <repositories>
     <repository>
       <id>googleapis</id>
@@ -81,20 +80,6 @@
           <target>5</target>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution><goals><goal>check</goal></goals></execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/datastore/pom.xml b/datastore/pom.xml
index 7f51d55b23b..c17985e912f 100644
--- a/datastore/pom.xml
+++ b/datastore/pom.xml
@@ -6,6 +6,14 @@
   <groupId>com.google.datastore.snippets</groupId>
   <artifactId>datastore-snippets</artifactId>
   <version>1.0</version>
+
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>..</relativePath>
+  </parent>
+
   <packaging>jar</packaging>
   <name>Google Cloud Datastore Snippets</name>
   <description>
@@ -21,6 +29,10 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
+      <!-- JUnit is used in the Concepts class, which is in the main not test
+           directory, so we must override test scope inherited from the parent
+           pom. -->
+      <scope>compile</scope>
     </dependency>
   </dependencies>
   <build>
@@ -46,20 +58,6 @@
         </configuration>
       </plugin>
 <!-- // [END exec] -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution><goals><goal>check</goal></goals></execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/logging/pom.xml b/logging/pom.xml
index f6d82b8dab0..eb803b986bb 100644
--- a/logging/pom.xml
+++ b/logging/pom.xml
@@ -55,20 +55,6 @@
           <target>5</target>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution><goals><goal>check</goal></goals></execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/managed_vms/analytics/pom.xml b/managed_vms/analytics/pom.xml
index bf19a9dc655..bc0b76bd211 100644
--- a/managed_vms/analytics/pom.xml
+++ b/managed_vms/analytics/pom.xml
@@ -5,7 +5,15 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.managedvms</groupId>
-  <artifactId>appengine-analytics</artifactId>
+  <artifactId>managed-vms-analytics</artifactId>
+
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
@@ -46,20 +54,6 @@
           <target>1.8</target>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution><goals><goal>check</goal></goals></execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
diff --git a/managed_vms/async-rest/pom.xml b/managed_vms/async-rest/pom.xml
index 7e5f50081cc..25d44b5775f 100644
--- a/managed_vms/async-rest/pom.xml
+++ b/managed_vms/async-rest/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.appengine.demos</groupId>
-  <artifactId>async-rest</artifactId>
+  <artifactId>managed-vms-async-rest</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>Example Async Rest Webapp</name>
diff --git a/managed_vms/cloudsql/pom.xml b/managed_vms/cloudsql/pom.xml
index 929e986a2fd..2fe8c74d4aa 100644
--- a/managed_vms/cloudsql/pom.xml
+++ b/managed_vms/cloudsql/pom.xml
@@ -5,7 +5,15 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.managedvms</groupId>
-  <artifactId>appengine-cloudsql</artifactId>
+  <artifactId>managed-vms-cloudsql</artifactId>
+
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -48,20 +56,6 @@
           <target>1.8</target>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution><goals><goal>check</goal></goals></execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
diff --git a/managed_vms/cloudstorage/pom.xml b/managed_vms/cloudstorage/pom.xml
index c8be0497dd7..0537fd90bf9 100644
--- a/managed_vms/cloudstorage/pom.xml
+++ b/managed_vms/cloudstorage/pom.xml
@@ -5,7 +5,15 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.managedvms</groupId>
-  <artifactId>appengine-cloudstorage</artifactId>
+  <artifactId>managed-vms-cloudstorage</artifactId>
+
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -48,20 +56,6 @@
           <target>1.8</target>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution><goals><goal>check</goal></goals></execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
diff --git a/managed_vms/datastore/pom.xml b/managed_vms/datastore/pom.xml
index 6cf3e31560a..dbca3eb4747 100644
--- a/managed_vms/datastore/pom.xml
+++ b/managed_vms/datastore/pom.xml
@@ -5,7 +5,15 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.managedvms</groupId>
-  <artifactId>appengine-datastore</artifactId>
+  <artifactId>managed-vms-datastore</artifactId>
+
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -48,24 +56,6 @@
           <target>1.8</target>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
diff --git a/managed_vms/disk/pom.xml b/managed_vms/disk/pom.xml
index c9ec443df00..89591b98c7d 100644
--- a/managed_vms/disk/pom.xml
+++ b/managed_vms/disk/pom.xml
@@ -5,7 +5,15 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.managedvms</groupId>
-  <artifactId>appengine-disk</artifactId>
+  <artifactId>managed-vms-disk</artifactId>
+
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -41,20 +49,6 @@
           <target>1.8</target>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution><goals><goal>check</goal></goals></execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
diff --git a/managed_vms/extending-runtime/pom.xml b/managed_vms/extending-runtime/pom.xml
index 3328036aaa3..10009b10732 100644
--- a/managed_vms/extending-runtime/pom.xml
+++ b/managed_vms/extending-runtime/pom.xml
@@ -5,7 +5,15 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.managedvms</groupId>
-  <artifactId>appengine-extendingruntime</artifactId>
+  <artifactId>managed-vms-extendingruntime</artifactId>
+
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -41,20 +49,6 @@
           <target>1.8</target>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution><goals><goal>check</goal></goals></execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
diff --git a/managed_vms/helloworld/pom.xml b/managed_vms/helloworld/pom.xml
index 635e10beb3c..364a4b2e8f8 100644
--- a/managed_vms/helloworld/pom.xml
+++ b/managed_vms/helloworld/pom.xml
@@ -6,7 +6,14 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.managedvms</groupId>
-  <artifactId>managedvms-helloworld-mvm</artifactId>
+  <artifactId>managed-vms-helloworld</artifactId>
+
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
 
   <!-- [START dependencies] -->
   <dependencies>
@@ -46,20 +53,6 @@
           <target>1.8</target>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution><goals><goal>check</goal></goals></execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
diff --git a/managed_vms/mailgun/pom.xml b/managed_vms/mailgun/pom.xml
index 568fea1ab6e..10f4090955c 100644
--- a/managed_vms/mailgun/pom.xml
+++ b/managed_vms/mailgun/pom.xml
@@ -5,7 +5,15 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.managedvms</groupId>
-  <artifactId>appengine-mailgun</artifactId>
+  <artifactId>managed-vms-mailgun</artifactId>
+
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -58,20 +66,6 @@
           <target>1.8</target>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution><goals><goal>check</goal></goals></execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
diff --git a/managed_vms/memcache/pom.xml b/managed_vms/memcache/pom.xml
index 2d3375745a7..3f17cf75f9e 100644
--- a/managed_vms/memcache/pom.xml
+++ b/managed_vms/memcache/pom.xml
@@ -5,7 +5,15 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.managedvms</groupId>
-  <artifactId>appengine-memcache</artifactId>
+  <artifactId>managed-vms-memcache</artifactId>
+
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -48,20 +56,6 @@
           <target>1.8</target>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution><goals><goal>check</goal></goals></execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
diff --git a/managed_vms/sendgrid/pom.xml b/managed_vms/sendgrid/pom.xml
index 6a3c5e85cbd..bd76abe7d45 100644
--- a/managed_vms/sendgrid/pom.xml
+++ b/managed_vms/sendgrid/pom.xml
@@ -5,7 +5,15 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.managedvms</groupId>
-  <artifactId>appengine-sendgrid</artifactId>
+  <artifactId>managed-vms-sendgrid</artifactId>
+
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -48,20 +56,6 @@
           <target>1.8</target>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution><goals><goal>check</goal></goals></execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
diff --git a/managed_vms/sparkjava/pom.xml b/managed_vms/sparkjava/pom.xml
index 8218eb1be67..28b33811648 100644
--- a/managed_vms/sparkjava/pom.xml
+++ b/managed_vms/sparkjava/pom.xml
@@ -4,8 +4,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.appengine.sparkdemo</groupId>
-  <artifactId>sparkdemo</artifactId>
+  <artifactId>managed-vms-spark</artifactId>
   <version>1.0</version>
+
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
   <dependencies>
     <dependency>
       <groupId>com.sparkjava</groupId>
@@ -91,20 +99,6 @@
         <configuration>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution><goals><goal>check</goal></goals></execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/managed_vms/static-files/pom.xml b/managed_vms/static-files/pom.xml
index 44604d0c01f..4eb45cdf490 100644
--- a/managed_vms/static-files/pom.xml
+++ b/managed_vms/static-files/pom.xml
@@ -5,7 +5,15 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.managedvms</groupId>
-  <artifactId>appengine-staticfiles</artifactId>
+  <artifactId>managed-vms-staticfiles</artifactId>
+
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -41,20 +49,6 @@
           <target>1.8</target>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution><goals><goal>check</goal></goals></execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
diff --git a/managed_vms/twilio/pom.xml b/managed_vms/twilio/pom.xml
index 26fe22f51a1..9e1dd429f94 100644
--- a/managed_vms/twilio/pom.xml
+++ b/managed_vms/twilio/pom.xml
@@ -5,7 +5,15 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.managedvms</groupId>
-  <artifactId>appengine-twilio</artifactId>
+  <artifactId>managed-vms-twilio</artifactId>
+
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
   <dependencies>
     <!-- [START dependencies] -->
     <dependency>
@@ -48,20 +56,6 @@
           <target>1.8</target>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution><goals><goal>check</goal></goals></execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
diff --git a/monitoring/pom.xml b/monitoring/pom.xml
index d2a13eadee3..0e77711d9b5 100644
--- a/monitoring/pom.xml
+++ b/monitoring/pom.xml
@@ -63,20 +63,6 @@
           <target>5</target>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution><goals><goal>check</goal></goals></execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/pom.xml b/pom.xml
index 1fac8254359..e426c9bfdf9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,11 @@
     <modules>
         <module>appengine/appidentity</module>
         <module>appengine/helloworld</module>
+        <module>bigquery</module>
+        <module>datastore</module>
+        <module>logging</module>
         <module>managed_vms/analytics</module>
+        <module>managed_vms/async-rest</module>
         <module>managed_vms/cloudsql</module>
         <module>managed_vms/cloudstorage</module>
         <module>managed_vms/datastore</module>
@@ -35,13 +39,9 @@
         <module>managed_vms/mailgun</module>
         <module>managed_vms/memcache</module>
         <module>managed_vms/sendgrid</module>
+        <module>managed_vms/sparkjava</module>
         <module>managed_vms/static-files</module>
         <module>managed_vms/twilio</module>
-        <module>managed_vms/async-rest</module>
-        <module>managed_vms/sparkjava</module>
-        <module>bigquery</module>
-        <module>datastore</module>
-        <module>logging</module>
         <module>monitoring</module>
         <module>storage/json-api</module>
         <module>storage/storage-transfer</module>
diff --git a/storage/json-api/pom.xml b/storage/json-api/pom.xml
index 704788cf97d..7feeca06b11 100644
--- a/storage/json-api/pom.xml
+++ b/storage/json-api/pom.xml
@@ -29,20 +29,6 @@
           <mainClass>StorageSample</mainClass>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution><goals><goal>check</goal></goals></execution>
-        </executions>
-      </plugin>
     </plugins>
     <finalName>${project.artifactId}-${project.version}</finalName>
   </build>
diff --git a/storage/storage-transfer/pom.xml b/storage/storage-transfer/pom.xml
index cc01eb9f346..a93abe75607 100644
--- a/storage/storage-transfer/pom.xml
+++ b/storage/storage-transfer/pom.xml
@@ -26,7 +26,7 @@
   </parent>
 
   <groupId>com.google.storagetransfer.samples</groupId>
-  <artifactId>transfersample</artifactId>
+  <artifactId>storage-transfersample</artifactId>
   <version>0.1</version>
   <packaging>jar</packaging>
 
@@ -70,20 +70,6 @@
           <target>1.7</target>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution><goals><goal>check</goal></goals></execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/storage/xml-api/cmdline-sample/pom.xml b/storage/xml-api/cmdline-sample/pom.xml
index 1b908eb46d9..fe0faaaf755 100644
--- a/storage/xml-api/cmdline-sample/pom.xml
+++ b/storage/xml-api/cmdline-sample/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
-
   <parent>
     <artifactId>doc-samples</artifactId>
     <groupId>com.google.cloud</groupId>
@@ -8,28 +7,13 @@
     <relativePath>../../..</relativePath>
   </parent>
 
-
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.apis-samples</groupId>
-  <artifactId>storage-cmd-line-sample</artifactId>
+  <artifactId>storage-xml-cmdline-sample</artifactId>
   <version>1</version>
   <name>Example for the Google Cloud Storage XML API using Application Default Credentials.</name>
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../../../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution><goals><goal>check</goal></goals></execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
diff --git a/storage/xml-api/serviceaccount-appengine-sample/pom.xml b/storage/xml-api/serviceaccount-appengine-sample/pom.xml
index 59f6cf2de0a..5ea1f5e755d 100644
--- a/storage/xml-api/serviceaccount-appengine-sample/pom.xml
+++ b/storage/xml-api/serviceaccount-appengine-sample/pom.xml
@@ -10,7 +10,7 @@
   </parent>
 
   <groupId>com.google.apis-samples</groupId>
-  <artifactId>serviceaccounts-appengine-sample</artifactId>
+  <artifactId>storage-xml-serviceaccounts-appengine-sample</artifactId>
   <version>1.0.0</version>
   <name>Example for Google Cloud Storage using OAuth 2.0 Service Accounts on Google App Engine</name>
   <packaging>war</packaging>
@@ -92,20 +92,6 @@
           <goals>gae:deploy</goals>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-          <configLocation>../../../google-checks.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-        </configuration>
-        <executions>
-          <execution><goals><goal>check</goal></goals></execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <dependencies>
diff --git a/taskqueue/deferred/pom.xml b/taskqueue/deferred/pom.xml
index cba8ea154d1..acc3ed12838 100644
--- a/taskqueue/deferred/pom.xml
+++ b/taskqueue/deferred/pom.xml
@@ -13,14 +13,14 @@
     </parent>
 
     <groupId>com.google.cloud.taskqueue.samples</groupId>
-    <artifactId>defer-sample</artifactId>
+    <artifactId>taskqueue-defer-sample</artifactId>
 
     <properties>
         <appengine.version>1.9.19</appengine.version>
         <appengine.app.version>1</appengine.app.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
-  
+
     <dependencies>
         <!-- Compile/runtime dependencies -->
         <dependency>
@@ -116,20 +116,6 @@
                     </jvmFlags -->
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.17</version>
-                <configuration>
-                    <configLocation>../../google-checks.xml</configLocation>
-                    <consoleOutput>true</consoleOutput>
-                    <failOnViolation>true</failOnViolation>
-                    <failsOnError>true</failsOnError>
-                </configuration>
-                <executions>
-                    <execution><goals><goal>check</goal></goals></execution>
-                </executions>
-             </plugin>
         </plugins>
     </build>
 
diff --git a/unittests/pom.xml b/unittests/pom.xml
index caabbe1516a..9ecc10cb9cb 100644
--- a/unittests/pom.xml
+++ b/unittests/pom.xml
@@ -12,9 +12,8 @@
         <relativePath>..</relativePath>
     </parent>
 
-
     <groupId>com.google.appengine.samples</groupId>
-    <artifactId>appengine-local-testing-samples</artifactId>
+    <artifactId>unittests-appengine-local-testing-samples</artifactId>
 
     <properties>
         <appengine.app.version>1</appengine.app.version>
@@ -100,20 +99,6 @@
                 <artifactId>appengine-maven-plugin</artifactId>
                 <version>${appengine.target.version}</version>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.17</version>
-                <configuration>
-                    <configLocation>../google-checks.xml</configLocation>
-                    <consoleOutput>true</consoleOutput>
-                    <failOnViolation>true</failOnViolation>
-                    <failsOnError>true</failsOnError>
-                </configuration>
-                <executions>
-                    <execution><goals><goal>check</goal></goals></execution>
-                </executions>
-             </plugin>
         </plugins>
     </build>