Skip to content

Commit

Permalink
Remove redundant checkstyle plugin definitions.
Browse files Browse the repository at this point in the history 
The submodules do not need checkstyle plugin defined if they define the
parent.
  • Loading branch information
@tswast
tswast committed Mar 1, 2016
1 parent 860a9b3 commit 2384e51
Show file tree
Hide file tree
Showing 27 changed files with 153 additions and 383 deletions.
21 changes: 7 additions & 14 deletions appengine/appidentity/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
20 changes: 6 additions & 14 deletions appengine/helloworld/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
15 changes: 0 additions & 15 deletions bigquery/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<relativePath>..</relativePath>
</parent>


<repositories>
<repository>
<id>googleapis</id>
Expand Down Expand Up @@ -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>

Expand Down
26 changes: 12 additions & 14 deletions datastore/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
14 changes: 0 additions & 14 deletions logging/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
24 changes: 9 additions & 15 deletions managed_vms/analytics/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion managed_vms/async-rest/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
24 changes: 9 additions & 15 deletions managed_vms/cloudsql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
24 changes: 9 additions & 15 deletions managed_vms/cloudstorage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
28 changes: 9 additions & 19 deletions managed_vms/datastore/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
24 changes: 9 additions & 15 deletions managed_vms/disk/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Loading

0 comments on commit 2384e51

Please sign in to comment.