From f493f4f8af942179927fb5ad741e2e7ebf27a40f Mon Sep 17 00:00:00 2001
From: Fokko Driesprong <fokko@apache.org>
Date: Wed, 19 Jun 2019 14:11:19 +0200
Subject: [PATCH 1/2] PARQUET-1605: Bump maven-javadoc-plugin from 2.9 to 3.1.0

---
 parquet-format-structures/pom.xml | 2 ++
 pom.xml                           | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/parquet-format-structures/pom.xml b/parquet-format-structures/pom.xml
index a5dbabbc1d..60ec4add8d 100644
--- a/parquet-format-structures/pom.xml
+++ b/parquet-format-structures/pom.xml
@@ -126,6 +126,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${maven-javadoc-plugin.version}</version>
         <configuration>
           <!-- We have to turn off the javadoc check because thrift generates improper comments -->
           <additionalparam>-Xdoclint:none</additionalparam>
@@ -139,6 +140,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${maven-javadoc-plugin.version}</version>
         <configuration>
           <!-- We have to turn off the javadoc check because thrift generates improper comments -->
           <additionalparam>-Xdoclint:none</additionalparam>
diff --git a/pom.xml b/pom.xml
index 1808dbab2d..cd839fe6f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,6 +101,7 @@
     <guava.version>27.0.1-jre</guava.version>
     <brotli-codec.version>0.1.1</brotli-codec.version>
     <mockito.version>1.10.19</mockito.version>
+    <maven-javadoc-plugin.version>3.1.0</maven-javadoc-plugin.version>
 
     <!-- parquet-cli dependencies -->
     <opencsv.version>2.3</opencsv.version>
@@ -161,7 +162,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.9</version>
+        <version>${maven-javadoc-plugin.version}</version>
         <reportSets>
           <reportSet><!-- by default, id = "default" -->
             <reports><!-- select non-aggregate reports -->
@@ -363,6 +364,11 @@
       </plugins>
     </pluginManagement>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${maven-javadoc-plugin.version}</version>
+      </plugin>
       <plugin>
         <groupId>com.mycila.maven-license-plugin</groupId>
         <artifactId>maven-license-plugin</artifactId>

From 081014ea1d38ed4af5ae3526d0f6ebdf6ebac4b2 Mon Sep 17 00:00:00 2001
From: Fokko Driesprong <fokko@apache.org>
Date: Wed, 19 Jun 2019 15:30:02 +0200
Subject: [PATCH 2/2] Disable Doclint on the generated Thrift sources

---
 parquet-format-structures/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parquet-format-structures/pom.xml b/parquet-format-structures/pom.xml
index 60ec4add8d..55f8e25a8b 100644
--- a/parquet-format-structures/pom.xml
+++ b/parquet-format-structures/pom.xml
@@ -129,7 +129,7 @@
         <version>${maven-javadoc-plugin.version}</version>
         <configuration>
           <!-- We have to turn off the javadoc check because thrift generates improper comments -->
-          <additionalparam>-Xdoclint:none</additionalparam>
+          <doclint>none</doclint>
         </configuration>
       </plugin>
     </plugins>
@@ -143,7 +143,7 @@
         <version>${maven-javadoc-plugin.version}</version>
         <configuration>
           <!-- We have to turn off the javadoc check because thrift generates improper comments -->
-          <additionalparam>-Xdoclint:none</additionalparam>
+          <doclint>none</doclint>
         </configuration>
       </plugin>
     </plugins>