Skip to content

Commit 628479d

Browse files
tswasttswast
committed
Merge pull request #98 from GoogleCloudPlatform/checkstyle
Remove redundant checkstyle plugin definitions.
2 parents 860a9b3 + 2384e51 commit 628479d

File tree

27 files changed

+153
-383
lines changed

27 files changed

+153
-383
lines changed

‎appengine/appidentity/pom.xml‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ Copyright 2015 Google Inc. All Rights Reserved.
2222
<groupId>com.example.appengine</groupId>
2323
<artifactId>appengine-appidentity</artifactId>
2424

25+
<parent>
26+
<groupId>com.google.cloud</groupId>
27+
<artifactId>doc-samples</artifactId>
28+
<version>1.0.0</version>
29+
<relativePath>../..</relativePath>
30+
</parent>
31+
2532
<properties>
2633
<appengine.target.version>1.9.30</appengine.target.version>
2734
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -107,20 +114,6 @@ Copyright 2015 Google Inc. All Rights Reserved.
107114
<artifactId>gcloud-maven-plugin</artifactId>
108115
<version>2.0.9.90.v20151210</version>
109116
</plugin>
110-
<plugin>
111-
<groupId>org.apache.maven.plugins</groupId>
112-
<artifactId>maven-checkstyle-plugin</artifactId>
113-
<version>2.17</version>
114-
<configuration>
115-
<configLocation>../../google-checks.xml</configLocation>
116-
<consoleOutput>true</consoleOutput>
117-
<failOnViolation>true</failOnViolation>
118-
<failsOnError>true</failsOnError>
119-
</configuration>
120-
<executions>
121-
<execution><goals><goal>check</goal></goals></execution>
122-
</executions>
123-
</plugin>
124117
</plugins>
125118
</build>
126119
</project>

‎appengine/helloworld/pom.xml‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ Copyright 2015 Google Inc. All Rights Reserved.
2121
<version>1.0-SNAPSHOT</version>
2222
<groupId>com.example.appengine</groupId>
2323
<artifactId>appengine-helloworld</artifactId>
24+
<parent>
25+
<groupId>com.google.cloud</groupId>
26+
<artifactId>doc-samples</artifactId>
27+
<version>1.0.0</version>
28+
<relativePath>../..</relativePath>
29+
</parent>
2430
<dependencies>
2531
<dependency>
2632
<groupId>javax.servlet</groupId>
@@ -48,20 +54,6 @@ Copyright 2015 Google Inc. All Rights Reserved.
4854
<artifactId>appengine-maven-plugin</artifactId>
4955
<version>1.9.31</version>
5056
</plugin>
51-
<plugin>
52-
<groupId>org.apache.maven.plugins</groupId>
53-
<artifactId>maven-checkstyle-plugin</artifactId>
54-
<version>2.17</version>
55-
<configuration>
56-
<configLocation>../../google-checks.xml</configLocation>
57-
<consoleOutput>true</consoleOutput>
58-
<failOnViolation>true</failOnViolation>
59-
<failsOnError>true</failsOnError>
60-
</configuration>
61-
<executions>
62-
<execution><goals><goal>check</goal></goals></execution>
63-
</executions>
64-
</plugin>
6557
</plugins>
6658
</build>
6759
</project>

‎bigquery/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<relativePath>..</relativePath>
1313
</parent>
1414

15-
1615
<repositories>
1716
<repository>
1817
<id>googleapis</id>
@@ -81,20 +80,6 @@
8180
<target>5</target>
8281
</configuration>
8382
</plugin>
84-
<plugin>
85-
<groupId>org.apache.maven.plugins</groupId>
86-
<artifactId>maven-checkstyle-plugin</artifactId>
87-
<version>2.17</version>
88-
<configuration>
89-
<configLocation>../google-checks.xml</configLocation>
90-
<consoleOutput>true</consoleOutput>
91-
<failOnViolation>true</failOnViolation>
92-
<failsOnError>true</failsOnError>
93-
</configuration>
94-
<executions>
95-
<execution><goals><goal>check</goal></goals></execution>
96-
</executions>
97-
</plugin>
9883
</plugins>
9984
</build>
10085

‎datastore/pom.xml‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@
66
<groupId>com.google.datastore.snippets</groupId>
77
<artifactId>datastore-snippets</artifactId>
88
<version>1.0</version>
9+
10+
<parent>
11+
<artifactId>doc-samples</artifactId>
12+
<groupId>com.google.cloud</groupId>
13+
<version>1.0.0</version>
14+
<relativePath>..</relativePath>
15+
</parent>
16+
917
<packaging>jar</packaging>
1018
<name>Google Cloud Datastore Snippets</name>
1119
<description>
@@ -21,6 +29,10 @@
2129
<groupId>junit</groupId>
2230
<artifactId>junit</artifactId>
2331
<version>4.12</version>
32+
<!-- JUnit is used in the Concepts class, which is in the main not test
33+
directory, so we must override test scope inherited from the parent
34+
pom. -->
35+
<scope>compile</scope>
2436
</dependency>
2537
</dependencies>
2638
<build>
@@ -46,20 +58,6 @@
4658
</configuration>
4759
</plugin>
4860
<!-- // [END exec] -->
49-
<plugin>
50-
<groupId>org.apache.maven.plugins</groupId>
51-
<artifactId>maven-checkstyle-plugin</artifactId>
52-
<version>2.17</version>
53-
<configuration>
54-
<configLocation>../google-checks.xml</configLocation>
55-
<consoleOutput>true</consoleOutput>
56-
<failOnViolation>true</failOnViolation>
57-
<failsOnError>true</failsOnError>
58-
</configuration>
59-
<executions>
60-
<execution><goals><goal>check</goal></goals></execution>
61-
</executions>
62-
</plugin>
6361
</plugins>
6462
</build>
6563
</project>

‎logging/pom.xml‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,6 @@
5555
<target>5</target>
5656
</configuration>
5757
</plugin>
58-
<plugin>
59-
<groupId>org.apache.maven.plugins</groupId>
60-
<artifactId>maven-checkstyle-plugin</artifactId>
61-
<version>2.17</version>
62-
<configuration>
63-
<configLocation>../google-checks.xml</configLocation>
64-
<consoleOutput>true</consoleOutput>
65-
<failOnViolation>true</failOnViolation>
66-
<failsOnError>true</failsOnError>
67-
</configuration>
68-
<executions>
69-
<execution><goals><goal>check</goal></goals></execution>
70-
</executions>
71-
</plugin>
7258
</plugins>
7359
</build>
7460

‎managed_vms/analytics/pom.xml‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,15 @@
55
<packaging>war</packaging>
66
<version>1.0-SNAPSHOT</version>
77
<groupId>com.example.managedvms</groupId>
8-
<artifactId>appengine-analytics</artifactId>
8+
<artifactId>managed-vms-analytics</artifactId>
9+
10+
<parent>
11+
<artifactId>doc-samples</artifactId>
12+
<groupId>com.google.cloud</groupId>
13+
<version>1.0.0</version>
14+
<relativePath>../..</relativePath>
15+
</parent>
16+
917
<dependencies>
1018
<dependency>
1119
<groupId>org.apache.httpcomponents</groupId>
@@ -46,20 +54,6 @@
4654
<target>1.8</target>
4755
</configuration>
4856
</plugin>
49-
<plugin>
50-
<groupId>org.apache.maven.plugins</groupId>
51-
<artifactId>maven-checkstyle-plugin</artifactId>
52-
<version>2.17</version>
53-
<configuration>
54-
<configLocation>../../google-checks.xml</configLocation>
55-
<consoleOutput>true</consoleOutput>
56-
<failOnViolation>true</failOnViolation>
57-
<failsOnError>true</failsOnError>
58-
</configuration>
59-
<executions>
60-
<execution><goals><goal>check</goal></goals></execution>
61-
</executions>
62-
</plugin>
6357
<plugin>
6458
<groupId>org.eclipse.jetty</groupId>
6559
<artifactId>jetty-maven-plugin</artifactId>

‎managed_vms/async-rest/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<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">
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>com.google.appengine.demos</groupId>
4-
<artifactId>async-rest</artifactId>
4+
<artifactId>managed-vms-async-rest</artifactId>
55
<version>1.0.0-SNAPSHOT</version>
66
<packaging>war</packaging>
77
<name>Example Async Rest Webapp</name>

‎managed_vms/cloudsql/pom.xml‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,15 @@
55
<packaging>war</packaging>
66
<version>1.0-SNAPSHOT</version>
77
<groupId>com.example.managedvms</groupId>
8-
<artifactId>appengine-cloudsql</artifactId>
8+
<artifactId>managed-vms-cloudsql</artifactId>
9+
10+
<parent>
11+
<artifactId>doc-samples</artifactId>
12+
<groupId>com.google.cloud</groupId>
13+
<version>1.0.0</version>
14+
<relativePath>../..</relativePath>
15+
</parent>
16+
917
<dependencies>
1018
<dependency>
1119
<groupId>javax.servlet</groupId>
@@ -48,20 +56,6 @@
4856
<target>1.8</target>
4957
</configuration>
5058
</plugin>
51-
<plugin>
52-
<groupId>org.apache.maven.plugins</groupId>
53-
<artifactId>maven-checkstyle-plugin</artifactId>
54-
<version>2.17</version>
55-
<configuration>
56-
<configLocation>../../google-checks.xml</configLocation>
57-
<consoleOutput>true</consoleOutput>
58-
<failOnViolation>true</failOnViolation>
59-
<failsOnError>true</failsOnError>
60-
</configuration>
61-
<executions>
62-
<execution><goals><goal>check</goal></goals></execution>
63-
</executions>
64-
</plugin>
6559
<plugin>
6660
<groupId>org.eclipse.jetty</groupId>
6761
<artifactId>jetty-maven-plugin</artifactId>

‎managed_vms/cloudstorage/pom.xml‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,15 @@
55
<packaging>war</packaging>
66
<version>1.0-SNAPSHOT</version>
77
<groupId>com.example.managedvms</groupId>
8-
<artifactId>appengine-cloudstorage</artifactId>
8+
<artifactId>managed-vms-cloudstorage</artifactId>
9+
10+
<parent>
11+
<artifactId>doc-samples</artifactId>
12+
<groupId>com.google.cloud</groupId>
13+
<version>1.0.0</version>
14+
<relativePath>../..</relativePath>
15+
</parent>
16+
917
<dependencies>
1018
<dependency>
1119
<groupId>javax.servlet</groupId>
@@ -48,20 +56,6 @@
4856
<target>1.8</target>
4957
</configuration>
5058
</plugin>
51-
<plugin>
52-
<groupId>org.apache.maven.plugins</groupId>
53-
<artifactId>maven-checkstyle-plugin</artifactId>
54-
<version>2.17</version>
55-
<configuration>
56-
<configLocation>../../google-checks.xml</configLocation>
57-
<consoleOutput>true</consoleOutput>
58-
<failOnViolation>true</failOnViolation>
59-
<failsOnError>true</failsOnError>
60-
</configuration>
61-
<executions>
62-
<execution><goals><goal>check</goal></goals></execution>
63-
</executions>
64-
</plugin>
6559
<plugin>
6660
<groupId>org.eclipse.jetty</groupId>
6761
<artifactId>jetty-maven-plugin</artifactId>

‎managed_vms/datastore/pom.xml‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,15 @@
55
<packaging>war</packaging>
66
<version>1.0-SNAPSHOT</version>
77
<groupId>com.example.managedvms</groupId>
8-
<artifactId>appengine-datastore</artifactId>
8+
<artifactId>managed-vms-datastore</artifactId>
9+
10+
<parent>
11+
<artifactId>doc-samples</artifactId>
12+
<groupId>com.google.cloud</groupId>
13+
<version>1.0.0</version>
14+
<relativePath>../..</relativePath>
15+
</parent>
16+
917
<dependencies>
1018
<dependency>
1119
<groupId>javax.servlet</groupId>
@@ -48,24 +56,6 @@
4856
<target>1.8</target>
4957
</configuration>
5058
</plugin>
51-
<plugin>
52-
<groupId>org.apache.maven.plugins</groupId>
53-
<artifactId>maven-checkstyle-plugin</artifactId>
54-
<version>2.17</version>
55-
<configuration>
56-
<configLocation>../../google-checks.xml</configLocation>
57-
<consoleOutput>true</consoleOutput>
58-
<failOnViolation>true</failOnViolation>
59-
<failsOnError>true</failsOnError>
60-
</configuration>
61-
<executions>
62-
<execution>
63-
<goals>
64-
<goal>check</goal>
65-
</goals>
66-
</execution>
67-
</executions>
68-
</plugin>
6959
<plugin>
7060
<groupId>org.eclipse.jetty</groupId>
7161
<artifactId>jetty-maven-plugin</artifactId>

0 commit comments

Comments
 (0)