From 463e68520af78021ec2b225dd94f7c2c074e2c86 Mon Sep 17 00:00:00 2001
From: Lahiru Maramba <llahiru@gmail.com>
Date: Fri, 13 Aug 2021 16:00:28 -0400
Subject: [PATCH 1/5] Update custom Doclet configuration for javadoc

From version 3.0 and up `javadoc` has updated parameter names used in custom Doclet configurations, which affects our internal devsite scripts.
This PR updates the config to use the new parameters names.
---
 pom.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 489510588..1def0ed63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,16 +123,16 @@
                                     <version>1.3</version>
                                 </additionalDependency>
                             </additionalDependencies>
-                            <additionalparam>
-                                -hdf book.path /docs/reference/_book.yaml
-                                -hdf project.path /_project.yaml
-                                -hdf devsite.path /docs/reference/admin/java/reference/
-                                -d ${project.build.directory}/apidocs
-                                -templatedir ${devsite.template}
-                                -toroot /docs/reference/admin/java/reference/
-                                -yaml _toc.yaml
-                                -warning 101
-                            </additionalparam>
+                            <additionalOptions>
+                                <additionalOption>-hdf book.path /docs/reference/_book.yaml</additionalOption>
+                                <additionalOption>-hdf project.path /_project.yaml</additionalOption>
+                                <additionalOption>-hdf devsite.path /docs/reference/admin/java/reference/</additionalOption>
+                                <additionalOption>-d ${project.build.directory}/apidocs</additionalOption>
+                                <additionalOption>-templatedir ${devsite.template}</additionalOption>
+                                <additionalOption>-toroot /docs/reference/admin/java/reference/</additionalOption>
+                                <additionalOption>-yaml _toc.yaml</additionalOption>
+                                <additionalOption>-warning 101</additionalOption>
+                            </additionalOptions>
                             <useStandardDocletOptions>false</useStandardDocletOptions>
                             <additionalJOption>-J-Xmx1024m</additionalJOption>
                         </configuration>

From a72d8672f8e5efa56dec713a86f75f1be440840c Mon Sep 17 00:00:00 2001
From: Lahiru Maramba <llahiru@gmail.com>
Date: Fri, 20 Aug 2021 15:43:24 -0400
Subject: [PATCH 2/5] Update other param instances

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1def0ed63..2aff0e066 100644
--- a/pom.xml
+++ b/pom.xml
@@ -334,9 +334,9 @@
                             <version>1.3</version>
                         </additionalDependency>
                     </additionalDependencies>
-                    <additionalparam>
-                        -warning 101
-                    </additionalparam>
+                    <additionalOptions>
+                        <additionalOption>-warning 101</additionalOption>
+                    </additionalOptions>
                     <useStandardDocletOptions>false</useStandardDocletOptions>
                     <additionalJOption>-J-Xmx1024m</additionalJOption>
                 </configuration>

From 496beb950f640a325bc21fff9ee8db6212c30c61 Mon Sep 17 00:00:00 2001
From: Lahiru Maramba <llahiru@gmail.com>
Date: Wed, 22 Sep 2021 14:56:59 -0400
Subject: [PATCH 3/5] remove java 8 exception

---
 pom.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2aff0e066..75c876cd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,16 +77,6 @@
     </distributionManagement>
 
     <profiles>
-        <profile>
-            <!-- Disable Doclint on Java 8 and higher -->
-            <id>disable-java8-doclint</id>
-            <activation>
-                <jdk>[1.8,)</jdk>
-            </activation>
-            <properties>
-                <additionalparam>-Xdoclint:none</additionalparam>
-            </properties>
-        </profile>
         <profile>
             <id>devsite-apidocs</id>
             <activation>

From 113f21cab1e44edcf38d9d6f666a711abe813d78 Mon Sep 17 00:00:00 2001
From: Lahiru Maramba <llahiru@gmail.com>
Date: Wed, 22 Sep 2021 15:49:50 -0400
Subject: [PATCH 4/5] Add -Xdoclint:none option

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 75c876cd7..fbfe3f1e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,6 +125,7 @@
                             </additionalOptions>
                             <useStandardDocletOptions>false</useStandardDocletOptions>
                             <additionalJOption>-J-Xmx1024m</additionalJOption>
+                            <doclint>none</doclint>
                         </configuration>
                     </plugin>
                     <plugin>

From 8452c9d2e6ba09c2a71c76b1b020d69f0f04b106 Mon Sep 17 00:00:00 2001
From: Lahiru Maramba <llahiru@gmail.com>
Date: Wed, 22 Sep 2021 17:07:00 -0400
Subject: [PATCH 5/5] Added <doclint>none</doclint>

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index fbfe3f1e3..b5058f9f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -330,6 +330,7 @@
                     </additionalOptions>
                     <useStandardDocletOptions>false</useStandardDocletOptions>
                     <additionalJOption>-J-Xmx1024m</additionalJOption>
+                    <doclint>none</doclint>
                 </configuration>
             </plugin>