Merge pull request #300 from GoogleCloudPlatform/tswast-plugins

GoogleCloudPlatform · Aug 16, 2016 · b0fda6e · b0fda6e
2 parents 1a4a5d7 + a1561a4
commit b0fda6e
Show file tree

Hide file tree

Showing 29 changed files with 573 additions and 367 deletions.
diff --git a/appengine/analytics/pom.xml b/appengine/analytics/pom.xml
@@ -27,6 +27,12 @@
     <relativePath>../..</relativePath>
   </parent>
   <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
+
+  <properties>
+    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.7</maven.compiler.source>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>com.google.appengine</groupId>
@@ -55,15 +61,6 @@
         <artifactId>appengine-maven-plugin</artifactId>
         <version>${appengine.sdk.version}</version>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <version>3.3</version>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/appengine/appidentity/pom.xml b/appengine/appidentity/pom.xml
@@ -27,6 +27,10 @@
     <relativePath>../..</relativePath>
   </parent>
 
+  <properties>
+    <gcloud-maven-plugin-version>2.0.9.101.v20160316</gcloud-maven-plugin-version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>com.google.appengine</groupId>
@@ -96,7 +100,7 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>gcloud-maven-plugin</artifactId>
-        <version>2.0.9.101.v20160316</version>
+        <version>${gcloud-maven-plugin-version}</version>
       </plugin>
     </plugins>
   </build>

diff --git a/compute/error-reporting/pom.xml b/compute/error-reporting/pom.xml
@@ -1,17 +1,17 @@
 <!--
-Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc. All Rights Reserved.
 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
 
        http://www.apache.org/licenses/LICENSE-2.0
 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 <project>
   <modelVersion>4.0.0</modelVersion>
@@ -20,6 +20,22 @@ Copyright 2016 Google Inc. All Rights Reserved.
   <groupId>com.example.compute</groupId>
   <artifactId>compute-error-reporting</artifactId>
 
+  <!-- TODO: Use common parent after fixing checkstyle errors.
+       https://github.com/GoogleCloudPlatform/java-docs-samples/issues/298
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  -->
+
+  <properties>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven-assembly-plugin-version>2.6</maven-assembly-plugin-version>
+  </properties>
+
   <dependencies>
     <!-- [START dependencies] -->
     <dependency>
@@ -33,6 +49,7 @@ Copyright 2016 Google Inc. All Rights Reserved.
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven-assembly-plugin-version}</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -52,15 +69,6 @@ Copyright 2016 Google Inc. All Rights Reserved.
           </descriptorRefs>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <version>3.3</version>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/compute/sendgrid/pom.xml b/compute/sendgrid/pom.xml
@@ -1,17 +1,17 @@
 <!--
-Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc. All Rights Reserved.
 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
 
        http://www.apache.org/licenses/LICENSE-2.0
 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 <project>
   <modelVersion>4.0.0</modelVersion>
@@ -20,6 +20,22 @@ Copyright 2016 Google Inc. All Rights Reserved.
   <groupId>com.example.compute</groupId>
   <artifactId>compute-sendgrid</artifactId>
 
+  <!-- TODO: Use common parent after fixing checkstyle errors.
+       https://github.com/GoogleCloudPlatform/java-docs-samples/issues/298
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  -->
+
+  <properties>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven-assembly-plugin-version>2.6</maven-assembly-plugin-version>
+  </properties>
+
   <dependencies>
     <!-- [START dependencies] -->
     <dependency>
@@ -33,6 +49,7 @@ Copyright 2016 Google Inc. All Rights Reserved.
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven-assembly-plugin-version}</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -52,15 +69,6 @@ Copyright 2016 Google Inc. All Rights Reserved.
           </descriptorRefs>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <version>3.3</version>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/java-repo-tools/pom.xml b/java-repo-tools/pom.xml
@@ -24,6 +24,16 @@ limitations under the License.
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <codehaus-versions-maven-plugin-version>2.2</codehaus-versions-maven-plugin-version>
+    <jacoco-maven-plugin-version>0.7.6.201602180812</jacoco-maven-plugin-version>
+    <maven-clean-plugin-version>3.0.0</maven-clean-plugin-version>
+    <maven-checkstyle-plugin-version>2.17</maven-checkstyle-plugin-version>
+    <maven-deploy-plugin-version>2.8.2</maven-deploy-plugin-version>
+    <maven-failsafe-plugin-version>2.19.1</maven-failsafe-plugin-version>
+    <maven-install-plugin-version>2.5.2</maven-install-plugin-version>
+    <maven-resources-plugin-version>2.7</maven-resources-plugin-version>
+    <maven-site-plugin-version>3.5.1</maven-site-plugin-version>
+    <maven-surefire-plugin-version>2.19.1</maven-surefire-plugin-version>
   </properties>
 
   <prerequisites>
@@ -40,7 +50,7 @@ limitations under the License.
         <!-- Unit tests -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.19.1</version>
+        <version>${maven-surefire-plugin-version}</version>
         <configuration>
           <trimStackTrace>false</trimStackTrace>
         </configuration>
@@ -49,7 +59,7 @@ limitations under the License.
         <!-- Integration / system tests -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.19.1</version>
+        <version>${maven-failsafe-plugin-version}</version>
         <executions>
           <execution>
             <goals>
@@ -62,7 +72,7 @@ limitations under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
+        <version>${maven-checkstyle-plugin-version}</version>
         <configuration>
           <configLocation>google-checks.xml</configLocation>
           <consoleOutput>true</consoleOutput>
@@ -78,12 +88,12 @@ limitations under the License.
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>versions-maven-plugin</artifactId>
-        <version>2.2</version>
+        <version>${codehaus-versions-maven-plugin-version}</version>
       </plugin>
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.7.6.201602180812</version>
+        <version>${jacoco-maven-plugin-version}</version>
         <executions>
           <execution>
             <goals>

diff --git a/managed_vms/analytics/pom.xml b/managed_vms/analytics/pom.xml
@@ -1,6 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
+<!--
+  Copyright 2016 Google Inc. All Rights Reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project>
   <modelVersion>4.0.0</modelVersion>
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
@@ -14,6 +27,14 @@
     <relativePath>../..</relativePath>
   </parent>
 
+  <properties>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven-war-plugin-version>2.6</maven-war-plugin-version>
+    <gcloud-maven-plugin-version>2.0.9.106.v20160420</gcloud-maven-plugin-version>
+    <jetty-maven-plugin-version>9.3.7.v20160115</jetty-maven-plugin-version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
@@ -35,29 +56,20 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>gcloud-maven-plugin</artifactId>
-        <version>2.0.9.106.v20160420</version>
+        <version>${gcloud-maven-plugin-version}</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>2.6</version>
+        <version>${maven-war-plugin-version}</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <version>3.3</version>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
-        <version>9.3.7.v20160115</version>
+        <version>${jetty-maven-plugin-version}</version>
       </plugin>
     </plugins>
   </build>