From 9446ae6e4ae6975e950ee21afbb82021b151dea3 Mon Sep 17 00:00:00 2001
From: Andrea Lin <asdf.lina@gmail.com>
Date: Wed, 1 Aug 2018 15:44:03 -0700
Subject: [PATCH 1/7] move <reportPlugins> to <reporting><plugins>

---
 google-api-grpc/pom.xml      | 104 +++++++++++----------
 google-cloud-bom/pom.xml     |  66 ++++++-------
 google-cloud-clients/pom.xml | 175 ++++++++++++++++++-----------------
 3 files changed, 175 insertions(+), 170 deletions(-)

diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
index 4dc075681c58..7dd62dfbc432 100644
--- a/google-api-grpc/pom.xml
+++ b/google-api-grpc/pom.xml
@@ -681,61 +681,63 @@
         <version>3.4</version>
         <configuration>
           <skipDeploy>true</skipDeploy>
-          <reportPlugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-project-info-reports-plugin</artifactId>
-              <version>2.8.1</version>
-              <reportSets>
-                <reportSet>
-                  <reports>
-                    <report>index</report>
-                    <report>dependency-info</report>
-                    <report>project-team</report>
-                    <report>cim</report>
-                    <report>issue-tracking</report>
-                    <report>license</report>
-                    <report>scm</report>
-                    <report>dependency-management</report>
-                    <report>distribution-management</report>
-                    <report>summary</report>
-                    <report>modules</report>
-                  </reports>
-                </reportSet>
-              </reportSets>
-              <configuration>
-                <aggregate>true</aggregate>
-                <quiet>true</quiet>
-                <dependencyDetailsEnabled>true</dependencyDetailsEnabled>
-                <dependencyLocationsEnabled>true</dependencyLocationsEnabled>
-                <artifactId>${project.artifactId}</artifactId>
-                <packaging>jar</packaging>
-              </configuration>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-javadoc-plugin</artifactId>
-              <version>2.10.3</version>
-              <reportSets>
-                <reportSet>
-                  <id>html</id>
-                  <reports>
-                    <report>javadoc</report>
-                  </reports>
-                </reportSet>
-              </reportSets>
-              <configuration>
-                <aggregate>true</aggregate>
-                <show>protected</show>
-                <nohelp>true</nohelp>
-                <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
-              </configuration>
-            </plugin>
-          </reportPlugins>
         </configuration>
       </plugin>
     </plugins>
   </build>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.8.1</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>index</report>
+              <report>dependency-info</report>
+              <report>project-team</report>
+              <report>cim</report>
+              <report>issue-tracking</report>
+              <report>license</report>
+              <report>scm</report>
+              <report>dependency-management</report>
+              <report>distribution-management</report>
+              <report>summary</report>
+              <report>modules</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+        <configuration>
+          <aggregate>true</aggregate>
+          <quiet>true</quiet>
+          <dependencyDetailsEnabled>true</dependencyDetailsEnabled>
+          <dependencyLocationsEnabled>true</dependencyLocationsEnabled>
+          <artifactId>${project.artifactId}</artifactId>
+          <packaging>jar</packaging>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.10.3</version>
+        <reportSets>
+          <reportSet>
+            <id>html</id>
+            <reports>
+              <report>javadoc</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+        <configuration>
+          <aggregate>true</aggregate>
+          <show>protected</show>
+          <nohelp>true</nohelp>
+          <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
   <profiles>
     <profile>
       <id>release</id>
diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml
index 4565babf7148..3f83217ff3a6 100644
--- a/google-cloud-bom/pom.xml
+++ b/google-cloud-bom/pom.xml
@@ -1067,42 +1067,44 @@
         <version>3.4</version>
         <configuration>
           <skipDeploy>true</skipDeploy>
-          <reportPlugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-project-info-reports-plugin</artifactId>
-              <version>2.8.1</version>
-              <reportSets>
-                <reportSet>
-                  <reports>
-                    <report>index</report>
-                    <report>dependency-info</report>
-                    <report>project-team</report>
-                    <report>cim</report>
-                    <report>issue-tracking</report>
-                    <report>license</report>
-                    <report>scm</report>
-                    <report>dependency-management</report>
-                    <report>distribution-management</report>
-                    <report>summary</report>
-                    <report>modules</report>
-                  </reports>
-                </reportSet>
-              </reportSets>
-              <configuration>
-                <aggregate>true</aggregate>
-                <quiet>true</quiet>
-                <dependencyDetailsEnabled>true</dependencyDetailsEnabled>
-                <dependencyLocationsEnabled>true</dependencyLocationsEnabled>
-                <artifactId>google-cloud-bom</artifactId>
-                <packaging>jar</packaging>
-              </configuration>
-            </plugin>
-          </reportPlugins>
         </configuration>
       </plugin>
     </plugins>
   </build>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.8.1</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>index</report>
+              <report>dependency-info</report>
+              <report>project-team</report>
+              <report>cim</report>
+              <report>issue-tracking</report>
+              <report>license</report>
+              <report>scm</report>
+              <report>dependency-management</report>
+              <report>distribution-management</report>
+              <report>summary</report>
+              <report>modules</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+        <configuration>
+          <aggregate>true</aggregate>
+          <quiet>true</quiet>
+          <dependencyDetailsEnabled>true</dependencyDetailsEnabled>
+          <dependencyLocationsEnabled>true</dependencyLocationsEnabled>
+          <artifactId>google-cloud-bom</artifactId>
+          <packaging>jar</packaging>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
   <profiles>
     <profile>
       <id>release</id>
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 3ccc57a9644b..673863c23002 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -475,7 +475,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>exec-maven-plugin</artifactId>
-          <version>1.4.0</version>
+          <version>1.6.0</version>
           <configuration>
             <skip>true</skip>
             <executable>java</executable>
@@ -525,7 +525,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>1.4.0</version>
+        <version>1.6.0</version>
         <executions>
           <execution>
             <goals>
@@ -685,96 +685,97 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.4</version>
+        <version>3.6</version>
         <configuration>
           <skipDeploy>true</skipDeploy>
-          <reportPlugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-project-info-reports-plugin</artifactId>
-              <version>2.8.1</version>
-              <reportSets>
-                <reportSet>
-                  <reports>
-                    <report>index</report>
-                    <report>dependency-info</report>
-                    <report>project-team</report>
-                    <report>cim</report>
-                    <report>issue-tracking</report>
-                    <report>license</report>
-                    <report>scm</report>
-                    <report>dependency-management</report>
-                    <report>distribution-management</report>
-                    <report>summary</report>
-                    <report>modules</report>
-                  </reports>
-                </reportSet>
-              </reportSets>
-              <configuration>
-                <aggregate>true</aggregate>
-                <quiet>true</quiet>
-                <dependencyDetailsEnabled>true</dependencyDetailsEnabled>
-                <dependencyLocationsEnabled>true</dependencyLocationsEnabled>
-                <artifactId>${site.installationModule}</artifactId>
-                <packaging>jar</packaging>
-              </configuration>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-javadoc-plugin</artifactId>
-              <version>2.10.3</version>
-              <reportSets>
-                <reportSet>
-                  <id>html</id>
-                  <reports>
-                    <report>javadoc</report>
-                  </reports>
-                </reportSet>
-              </reportSets>
-              <configuration>
-                <aggregate>true</aggregate>
-                <show>protected</show>
-                <nohelp>true</nohelp>
-                <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
-                <groups>
-                  <group>
-                    <title>API packages</title>
-                    <packages>com.google.cloud*</packages>
-                  </group>
-                  <group>
-                    <title>Test helpers packages</title>
-                    <packages>com.google.cloud.bigquery.testing:com.google.cloud.testing:com.google.cloud.datastore.testing:com.google.cloud.dns.testing:com.google.cloud.logging.testing:com.google.cloud.pubsub.testing:com.google.cloud.resourcemanager.testing:com.google.cloud.storage.testing:com.google.cloud.translate.testing:com.google.cloud.spanner.testing:com.google.cloud.storage.contrib.nio.testing</packages>
-                  </group>
-                  <group>
-                    <title>Example packages</title>
-                    <packages>com.google.cloud.examples.*:com.google.cloud.nio.examples</packages>
-                  </group>
-                  <group>
-                    <title>SPI packages</title>
-                    <packages>com.google.cloud.spi*:com.google.cloud.bigquery.spi*:com.google.cloud.datastore.spi*:com.google.cloud.dns.spi*:com.google.cloud.firestore.spi*:com.google.cloud.logging.spi*:com.google.cloud.resourcemanager.spi*:com.google.cloud.spanner.spi*:com.google.cloud.storage.spi*:com.google.cloud.translate.spi*</packages>
-                  </group>
-                  <group>
-                    <title>Stub packages</title>
-                    <packages>com.google.cloud.automl.v1beta1.stub:com.google.cloud.bigquery.datatransfer.v1.stub:com.google.cloud.bigtable.admin.v2.stub:com.google.cloud.bigtable.data.v2.stub*:com.google.cloud.compute.v1.stub:com.google.cloud.container.v1.stub:com.google.cloud.dataproc.v1.stub:com.google.cloud.dataproc.v1beta2.stub:com.google.cloud.dlp.v2beta1.stub:com.google.cloud.dlp.v2.stub:com.google.cloud.dialogflow.v2beta1.stub:com.google.cloud.dialogflow.v2.stub:com.google.cloud.errorreporting.v1beta1.stub:com.google.cloud.firestore.v1beta1.stub:com.google.cloud.iot.v1.stub:com.google.cloud.kms.v1.stub:com.google.cloud.language.v1beta2.stub:com.google.cloud.language.v1.stub:com.google.cloud.logging.v2.stub:com.google.cloud.monitoring.v3.stub:com.google.cloud.oslogin.v1.stub:com.google.cloud.pubsub.v1.stub:com.google.cloud.redis.v1beta1.stub:com.google.cloud.spanner.admin.database.v1.stub:com.google.cloud.spanner.admin.instance.v1.stub:com.google.cloud.spanner.v1.stub:com.google.cloud.speech.v1beta1.stub:com.google.cloud.speech.v1p1beta1.stub:com.google.cloud.speech.v1.stub:com.google.cloud.tasks.v2beta2.stub:com.google.cloud.texttospeech.v1beta1.stub:com.google.cloud.texttospeech.v1.stub:com.google.cloud.trace.v1.stub:com.google.cloud.trace.v2.stub:com.google.cloud.videointelligence.v1beta1.stub:com.google.cloud.videointelligence.v1beta2.stub:com.google.cloud.videointelligence.v1.stub:com.google.cloud.videointelligence.v1p1beta1.stub:com.google.cloud.vision.v1.stub:com.google.cloud.vision.v1p1beta1.stub:com.google.cloud.vision.v1p2beta1.stub:com.google.cloud.vision.v1p3beta1.stub:com.google.cloud.websecurityscanner.v1alpha.stub</packages>
-                  </group>
-                  <group>
-                    <title>Deprecated packages</title>
-                    <packages>com.google.cloud.compute.deprecated*</packages>
-                  </group>
-                </groups>
-                <links>
-                  <link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
-                  <link>http://google.github.io/google-auth-library-java/releases/latest/apidocs/</link>
-                  <link>http://googleapis.github.io/gax-java/${gax.version}/apidocs/</link>
-                  <link>http://googleapis.github.io/googleapis/java/all/latest/apidocs/</link>
-                </links>
-              </configuration>
-            </plugin>
-          </reportPlugins>
         </configuration>
       </plugin>
     </plugins>
   </build>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>3.0.0</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>index</report>
+              <report>dependency-info</report>
+              <report>project-team</report>
+              <report>cim</report>
+              <report>issue-tracking</report>
+              <report>license</report>
+              <report>scm</report>
+              <report>dependency-management</report>
+              <report>distribution-management</report>
+              <report>summary</report>
+              <report>modules</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+        <configuration>
+          <aggregate>true</aggregate>
+          <quiet>true</quiet>
+          <dependencyDetailsEnabled>true</dependencyDetailsEnabled>
+          <dependencyLocationsEnabled>true</dependencyLocationsEnabled>
+          <artifactId>${site.installationModule}</artifactId>
+          <packaging>jar</packaging>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>3.0.1</version>
+        <reportSets>
+          <reportSet>
+            <id>html</id>
+            <reports>
+              <report>javadoc</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+        <configuration>
+          <show>protected</show>
+          <nohelp>true</nohelp>
+          <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
+          <groups>
+            <group>
+              <title>API packages</title>
+              <packages>com.google.cloud*</packages>
+            </group>
+            <group>
+              <title>Test helpers packages</title>
+              <packages>com.google.cloud.bigquery.testing:com.google.cloud.testing:com.google.cloud.datastore.testing:com.google.cloud.dns.testing:com.google.cloud.logging.testing:com.google.cloud.pubsub.testing:com.google.cloud.resourcemanager.testing:com.google.cloud.storage.testing:com.google.cloud.translate.testing:com.google.cloud.spanner.testing:com.google.cloud.storage.contrib.nio.testing</packages>
+            </group>
+            <group>
+              <title>Example packages</title>
+              <packages>com.google.cloud.examples.*:com.google.cloud.nio.examples</packages>
+            </group>
+            <group>
+              <title>SPI packages</title>
+              <packages>com.google.cloud.spi*:com.google.cloud.bigquery.spi*:com.google.cloud.datastore.spi*:com.google.cloud.dns.spi*:com.google.cloud.firestore.spi*:com.google.cloud.logging.spi*:com.google.cloud.resourcemanager.spi*:com.google.cloud.spanner.spi*:com.google.cloud.storage.spi*:com.google.cloud.translate.spi*</packages>
+            </group>
+            <group>
+              <title>Stub packages</title>
+              <packages>com.google.cloud.automl.v1beta1.stub:com.google.cloud.bigquery.datatransfer.v1.stub:com.google.cloud.bigtable.admin.v2.stub:com.google.cloud.bigtable.data.v2.stub*:com.google.cloud.compute.v1.stub:com.google.cloud.container.v1.stub:com.google.cloud.dataproc.v1.stub:com.google.cloud.dataproc.v1beta2.stub:com.google.cloud.dlp.v2beta1.stub:com.google.cloud.dlp.v2.stub:com.google.cloud.dialogflow.v2beta1.stub:com.google.cloud.dialogflow.v2.stub:com.google.cloud.errorreporting.v1beta1.stub:com.google.cloud.firestore.v1beta1.stub:com.google.cloud.iot.v1.stub:com.google.cloud.kms.v1.stub:com.google.cloud.language.v1beta2.stub:com.google.cloud.language.v1.stub:com.google.cloud.logging.v2.stub:com.google.cloud.monitoring.v3.stub:com.google.cloud.oslogin.v1.stub:com.google.cloud.pubsub.v1.stub:com.google.cloud.redis.v1beta1.stub:com.google.cloud.spanner.admin.database.v1.stub:com.google.cloud.spanner.admin.instance.v1.stub:com.google.cloud.spanner.v1.stub:com.google.cloud.speech.v1beta1.stub:com.google.cloud.speech.v1p1beta1.stub:com.google.cloud.speech.v1.stub:com.google.cloud.tasks.v2beta2.stub:com.google.cloud.texttospeech.v1beta1.stub:com.google.cloud.texttospeech.v1.stub:com.google.cloud.trace.v1.stub:com.google.cloud.trace.v2.stub:com.google.cloud.videointelligence.v1beta1.stub:com.google.cloud.videointelligence.v1beta2.stub:com.google.cloud.videointelligence.v1.stub:com.google.cloud.videointelligence.v1p1beta1.stub:com.google.cloud.vision.v1.stub:com.google.cloud.vision.v1p1beta1.stub:com.google.cloud.vision.v1p2beta1.stub:com.google.cloud.vision.v1p3beta1.stub:com.google.cloud.websecurityscanner.v1alpha.stub</packages>
+            </group>
+            <group>
+              <title>Deprecated packages</title>
+              <packages>com.google.cloud.compute.deprecated*</packages>
+            </group>
+          </groups>
+          <links>
+            <link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
+            <link>http://google.github.io/google-auth-library-java/releases/latest/apidocs/</link>
+            <link>http://googleapis.github.io/gax-java/${gax.version}/apidocs/</link>
+            <link>http://googleapis.github.io/googleapis/java/all/latest/apidocs/</link>
+          </links>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
   <profiles>
     <profile>
       <id>release</id>
@@ -796,7 +797,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.10.3</version>
+            <version>3.0.1</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>

From 2ec2e2d0769a5cf0e76c92a9fa182b971d905e42 Mon Sep 17 00:00:00 2001
From: Andrea Lin <asdf.lina@gmail.com>
Date: Wed, 1 Aug 2018 15:48:12 -0700
Subject: [PATCH 2/7] update some maven plugins to latest

---
 google-api-grpc/pom.xml                               | 8 ++++----
 google-cloud-bom/pom.xml                              | 4 ++--
 google-cloud-examples/pom.xml                         | 2 +-
 google-cloud-testing/pom.xml                          | 2 +-
 google-cloud-util/google-cloud-compat-checker/pom.xml | 2 +-
 google-cloud-util/pom.xml                             | 2 +-
 pom.xml                                               | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
index 7dd62dfbc432..b2de387278b6 100644
--- a/google-api-grpc/pom.xml
+++ b/google-api-grpc/pom.xml
@@ -678,7 +678,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.4</version>
+        <version>3.6</version>
         <configuration>
           <skipDeploy>true</skipDeploy>
         </configuration>
@@ -690,7 +690,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.8.1</version>
+        <version>3.0.0</version>
         <reportSets>
           <reportSet>
             <reports>
@@ -720,7 +720,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.10.3</version>
+        <version>3.0.1</version>
         <reportSets>
           <reportSet>
             <id>html</id>
@@ -759,7 +759,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.10.3</version>
+            <version>3.0.1</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml
index 3f83217ff3a6..688bb68fbcd1 100644
--- a/google-cloud-bom/pom.xml
+++ b/google-cloud-bom/pom.xml
@@ -1064,7 +1064,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.4</version>
+        <version>3.6</version>
         <configuration>
           <skipDeploy>true</skipDeploy>
         </configuration>
@@ -1076,7 +1076,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.8.1</version>
+        <version>3.0.0</version>
         <reportSets>
           <reportSet>
             <reports>
diff --git a/google-cloud-examples/pom.xml b/google-cloud-examples/pom.xml
index cd7d8d6963f7..96c18785967b 100644
--- a/google-cloud-examples/pom.xml
+++ b/google-cloud-examples/pom.xml
@@ -107,7 +107,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.4</version>
+        <version>3.6</version>
         <configuration>
           <skip>true</skip>
         </configuration>
diff --git a/google-cloud-testing/pom.xml b/google-cloud-testing/pom.xml
index 82598dba4356..de7d9f95fb77 100644
--- a/google-cloud-testing/pom.xml
+++ b/google-cloud-testing/pom.xml
@@ -96,7 +96,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.4</version>
+        <version>3.6</version>
         <configuration>
           <skip>true</skip>
         </configuration>
diff --git a/google-cloud-util/google-cloud-compat-checker/pom.xml b/google-cloud-util/google-cloud-compat-checker/pom.xml
index 97c57ab22872..46a2425b496d 100644
--- a/google-cloud-util/google-cloud-compat-checker/pom.xml
+++ b/google-cloud-util/google-cloud-compat-checker/pom.xml
@@ -65,7 +65,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.4</version>
+        <version>3.6</version>
         <configuration>
           <skip>true</skip>
         </configuration>
diff --git a/google-cloud-util/pom.xml b/google-cloud-util/pom.xml
index a9708cd81759..b519b9fbaa03 100644
--- a/google-cloud-util/pom.xml
+++ b/google-cloud-util/pom.xml
@@ -18,7 +18,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.4</version>
+        <version>3.6</version>
         <configuration>
           <skip>true</skip>
         </configuration>
diff --git a/pom.xml b/pom.xml
index 422cb0663662..ae4c0c37573d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.4</version>
+        <version>3.6</version>
         <configuration>
           <skip>true</skip>
         </configuration>

From d41fd62c892ea5456340276f69b99081def7fc50 Mon Sep 17 00:00:00 2001
From: Andrea Lin <asdf.lina@gmail.com>
Date: Wed, 1 Aug 2018 16:40:41 -0700
Subject: [PATCH 3/7] remove anchor_build from javadoc_test

---
 .circleci/config.yml                               | 2 --
 google-cloud-clients/google-cloud-bigquery/pom.xml | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0e582dc9c96b..285dfa575cdc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -238,8 +238,6 @@ jobs:
     <<: *anchor_docker
     steps:
       - checkout
-      - run:
-          <<: *anchor_build
       - run:
           name: Run mvn javadoc goal
           command: mvn javadoc:javadoc javadoc:test-javadoc
diff --git a/google-cloud-clients/google-cloud-bigquery/pom.xml b/google-cloud-clients/google-cloud-bigquery/pom.xml
index 4b066ee1c238..20bf961835ec 100644
--- a/google-cloud-clients/google-cloud-bigquery/pom.xml
+++ b/google-cloud-clients/google-cloud-bigquery/pom.xml
@@ -80,6 +80,7 @@
         <!-- Allow script to run, so we can run benchmarks. -->
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
+        <version>1.7</version>
         <configuration>
           <cleanupDaemonThreads>false</cleanupDaemonThreads>
           <skip>false</skip>

From edd6b9ac047d4535a2ca75ca947cf6b9ef8e6869 Mon Sep 17 00:00:00 2001
From: Andrea Lin <asdf.lina@gmail.com>
Date: Wed, 1 Aug 2018 16:46:57 -0700
Subject: [PATCH 4/7] add versions

---
 google-cloud-clients/google-cloud-bigquery/pom.xml              | 2 +-
 .../google-cloud-contrib/google-cloud-nio-examples/pom.xml      | 1 +
 .../google-cloud-contrib/google-cloud-nio/pom.xml               | 1 +
 google-cloud-clients/google-cloud-contrib/pom.xml               | 1 +
 google-cloud-examples/pom.xml                                   | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/google-cloud-clients/google-cloud-bigquery/pom.xml b/google-cloud-clients/google-cloud-bigquery/pom.xml
index 20bf961835ec..de5dbf46d2af 100644
--- a/google-cloud-clients/google-cloud-bigquery/pom.xml
+++ b/google-cloud-clients/google-cloud-bigquery/pom.xml
@@ -80,7 +80,7 @@
         <!-- Allow script to run, so we can run benchmarks. -->
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>1.7</version>
+        <version>1.6.0</version>
         <configuration>
           <cleanupDaemonThreads>false</cleanupDaemonThreads>
           <skip>false</skip>
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml
index c36657709bea..552bb5eb8d33 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml
@@ -28,6 +28,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
+        <version>1.6.0</version>
         <configuration>
           <skip>false</skip>
         </configuration>
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
index e741eee410e8..dc923e56f4a2 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
@@ -74,6 +74,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
+        <version>1.6.0</version>
         <configuration>
           <skip>false</skip>
         </configuration>
diff --git a/google-cloud-clients/google-cloud-contrib/pom.xml b/google-cloud-clients/google-cloud-contrib/pom.xml
index 6bf372a9e515..a5b8823ebb6a 100644
--- a/google-cloud-clients/google-cloud-contrib/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/pom.xml
@@ -29,6 +29,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
+        <version>1.6.0</version>
         <configuration>
           <skip>false</skip>
         </configuration>
diff --git a/google-cloud-examples/pom.xml b/google-cloud-examples/pom.xml
index 96c18785967b..51fbf71c7c3f 100644
--- a/google-cloud-examples/pom.xml
+++ b/google-cloud-examples/pom.xml
@@ -115,6 +115,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
+        <version>1.6.0</version>
         <configuration>
           <cleanupDaemonThreads>false</cleanupDaemonThreads>
           <skip>false</skip>

From 4a81c0cff340331e3b7e77a2f9b4c2b464154015 Mon Sep 17 00:00:00 2001
From: Andrea Lin <asdf.lina@gmail.com>
Date: Thu, 9 Aug 2018 12:00:52 -0700
Subject: [PATCH 5/7] comment out javadoc task in bigtable pom

---
 google-cloud-clients/google-cloud-bigtable/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-clients/google-cloud-bigtable/pom.xml b/google-cloud-clients/google-cloud-bigtable/pom.xml
index 55adc4f10786..9dc2f4f6f996 100644
--- a/google-cloud-clients/google-cloud-bigtable/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable/pom.xml
@@ -110,7 +110,7 @@
       </activation>
       <properties>
         <!-- add this to disable checking -->
-        <javadoc.opts>-Xdoclint:none</javadoc.opts>
+        <!--<javadoc.opts>-Xdoclint:none</javadoc.opts>-->
       </properties>
     </profile>
   </profiles>

From 09039bf67d689ebdfa7b48df4c1fec091c65bcb6 Mon Sep 17 00:00:00 2001
From: Andrea Lin <asdf.lina@gmail.com>
Date: Thu, 9 Aug 2018 13:42:35 -0700
Subject: [PATCH 6/7] add build step back to javadoc in circleci

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 285dfa575cdc..0e582dc9c96b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -238,6 +238,8 @@ jobs:
     <<: *anchor_docker
     steps:
       - checkout
+      - run:
+          <<: *anchor_build
       - run:
           name: Run mvn javadoc goal
           command: mvn javadoc:javadoc javadoc:test-javadoc

From ae815b8a6a8b7af85dd69667df5ff201fb8c8c83 Mon Sep 17 00:00:00 2001
From: Andrea Lin <asdf.lina@gmail.com>
Date: Tue, 14 Aug 2018 13:24:02 -0700
Subject: [PATCH 7/7] entirely remove doclint disable in bigtable

---
 google-cloud-clients/google-cloud-bigtable/pom.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/google-cloud-clients/google-cloud-bigtable/pom.xml b/google-cloud-clients/google-cloud-bigtable/pom.xml
index 9dc2f4f6f996..d3be5ce43e57 100644
--- a/google-cloud-clients/google-cloud-bigtable/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable/pom.xml
@@ -102,18 +102,6 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <profiles>
-    <profile>
-      <id>doclint-java8-disable</id>
-      <activation>
-        <jdk>[1.8,)</jdk>
-      </activation>
-      <properties>
-        <!-- add this to disable checking -->
-        <!--<javadoc.opts>-Xdoclint:none</javadoc.opts>-->
-      </properties>
-    </profile>
-  </profiles>
   <build>
     <plugins>
       <plugin>