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.
googleapis · Dec 4, 2018 · 619700a · 619700a
1 parent 50a8533
commit 619700a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 29 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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>