From bc5d67ae59d68fb5948ba46ba23f77f4c83576e2 Mon Sep 17 00:00:00 2001
From: iosmanthus <myosmanthustree@gmail.com>
Date: Thu, 10 Feb 2022 16:02:45 +0800
Subject: [PATCH 1/3] add javadoc in maven site reporting

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>
---
 pom.xml | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index b3aa7c07e3b..992b48dc9a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -256,6 +256,14 @@
 
     <reporting>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <skip>${javadoc.skip}</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
@@ -445,27 +453,6 @@
                     </filesets>
                 </configuration>
             </plugin>
-            <!-- Javadoc Plug-in -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.0.1</version>
-                <configuration>
-                    <skip>${javadoc.skip}</skip>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration> <!-- add this to disable checking -->
-                            <additionalparam>-Xdoclint:none</additionalparam>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <!--- Needs to shade Protobuf 3 since other projects might use other version -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

From 1330b159bdf63c129e6529d752cf64bd620d1704 Mon Sep 17 00:00:00 2001
From: iosmanthus <myosmanthustree@gmail.com>
Date: Thu, 10 Feb 2022 16:19:13 +0800
Subject: [PATCH 2/3] recover missing comments

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>
---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 992b48dc9a9..b336ac79ed9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -453,6 +453,7 @@
                     </filesets>
                 </configuration>
             </plugin>
+            <!--- Needs to shade Protobuf 3 since other projects might use other version -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

From d44b8754fbad03c14dd90c165b6092efd12b6ab5 Mon Sep 17 00:00:00 2001
From: iosmanthus <myosmanthustree@gmail.com>
Date: Thu, 10 Feb 2022 16:22:04 +0800
Subject: [PATCH 3/3] remove invalid config

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>
---
 pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index b336ac79ed9..963c041a019 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,6 @@
         <proto.folder>${basedir}/proto</proto.folder>
         <gpg.keyname>fake gpg key name</gpg.keyname>
         <gpg.skip>true</gpg.skip>
-        <javadoc.skip>true</javadoc.skip>
     </properties>
 
     <dependencies>
@@ -260,9 +259,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.3.1</version>
-                <configuration>
-                    <skip>${javadoc.skip}</skip>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>com.github.spotbugs</groupId>