From 619700a3db080fb88dc918feae79cc0ee8d30f94 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Tue, 4 Dec 2018 08:43:10 -0800
Subject: [PATCH] Update maven-javadoc-plugin to 3.0.1 and disable doclint.
 (#4167)

3.0.0 introduced a setting to disable doclint via config instead of a
necessitating a conditional profile based on the java version.
---
 google-api-grpc/pom.xml                              |  4 ++--
 .../google-cloud-bigtable-admin/pom.xml              | 12 ------------
 google-cloud-clients/google-cloud-bigtable/pom.xml   | 12 ------------
 google-cloud-clients/pom.xml                         |  7 +++++--
 .../google-cloud-bigtable-emulator/pom.xml           |  3 ++-
 5 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
index 17e1171ed647..340229253a64 100644
--- a/google-api-grpc/pom.xml
+++ b/google-api-grpc/pom.xml
@@ -813,7 +813,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>
@@ -927,7 +927,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-clients/google-cloud-bigtable-admin/pom.xml b/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
index 87f24fdb3c40..851e8d872d2b 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
@@ -94,18 +94,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>
diff --git a/google-cloud-clients/google-cloud-bigtable/pom.xml b/google-cloud-clients/google-cloud-bigtable/pom.xml
index da5dc8ac13ba..3485be86cbbe 100644
--- a/google-cloud-clients/google-cloud-bigtable/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable/pom.xml
@@ -97,18 +97,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>
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 9360d53c5a0f..7727cad243cb 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -733,7 +733,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>
@@ -743,6 +743,7 @@
                 </reportSet>
               </reportSets>
               <configuration>
+                <doclint>false</doclint>
                 <aggregate>true</aggregate>
                 <show>protected</show>
                 <nohelp>true</nohelp>
@@ -851,6 +852,7 @@
           </reportSet>
         </reportSets>
         <configuration>
+          <doclint>false</doclint>
           <show>protected</show>
           <nohelp>true</nohelp>
           <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
@@ -912,7 +914,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>
@@ -925,6 +927,7 @@
               <links>
                 <link>http://google.github.io/google-auth-library-java/releases/latest/apidocs/</link>
               </links>
+              <doclint>false</doclint>
             </configuration>
           </plugin>
           <plugin>
diff --git a/google-cloud-testing/google-cloud-bigtable-emulator/pom.xml b/google-cloud-testing/google-cloud-bigtable-emulator/pom.xml
index 384b595a5b16..8e7354a148d4 100644
--- a/google-cloud-testing/google-cloud-bigtable-emulator/pom.xml
+++ b/google-cloud-testing/google-cloud-bigtable-emulator/pom.xml
@@ -134,7 +134,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>
@@ -147,6 +147,7 @@
               <links>
                 <link>http://google.github.io/google-auth-library-java/releases/latest/apidocs/</link>
               </links>
+              <doclint>false</doclint>
             </configuration>
           </plugin>
           <plugin>