Skip to content

Commit 89ac0d0

Browse files
Update custom Doclet configuration for javadoc (#587)
* 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. * Update other param instances * remove java 8 exception * Add -Xdoclint:none option * Added <doclint>none</doclint>
1 parent 18826db commit 89ac0d0

File tree

1 file changed

+15
-23
lines changed

1 file changed

+15
-23
lines changed

pom.xml

+15-23
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,6 @@
7777
</distributionManagement>
7878

7979
<profiles>
80-
<profile>
81-
<!-- Disable Doclint on Java 8 and higher -->
82-
<id>disable-java8-doclint</id>
83-
<activation>
84-
<jdk>[1.8,)</jdk>
85-
</activation>
86-
<properties>
87-
<additionalparam>-Xdoclint:none</additionalparam>
88-
</properties>
89-
</profile>
9080
<profile>
9181
<id>devsite-apidocs</id>
9282
<activation>
@@ -123,18 +113,19 @@
123113
<version>1.3</version>
124114
</additionalDependency>
125115
</additionalDependencies>
126-
<additionalparam>
127-
-hdf book.path /docs/reference/_book.yaml
128-
-hdf project.path /_project.yaml
129-
-hdf devsite.path /docs/reference/admin/java/reference/
130-
-d ${project.build.directory}/apidocs
131-
-templatedir ${devsite.template}
132-
-toroot /docs/reference/admin/java/reference/
133-
-yaml _toc.yaml
134-
-warning 101
135-
</additionalparam>
116+
<additionalOptions>
117+
<additionalOption>-hdf book.path /docs/reference/_book.yaml</additionalOption>
118+
<additionalOption>-hdf project.path /_project.yaml</additionalOption>
119+
<additionalOption>-hdf devsite.path /docs/reference/admin/java/reference/</additionalOption>
120+
<additionalOption>-d ${project.build.directory}/apidocs</additionalOption>
121+
<additionalOption>-templatedir ${devsite.template}</additionalOption>
122+
<additionalOption>-toroot /docs/reference/admin/java/reference/</additionalOption>
123+
<additionalOption>-yaml _toc.yaml</additionalOption>
124+
<additionalOption>-warning 101</additionalOption>
125+
</additionalOptions>
136126
<useStandardDocletOptions>false</useStandardDocletOptions>
137127
<additionalJOption>-J-Xmx1024m</additionalJOption>
128+
<doclint>none</doclint>
138129
</configuration>
139130
</plugin>
140131
<plugin>
@@ -334,11 +325,12 @@
334325
<version>1.3</version>
335326
</additionalDependency>
336327
</additionalDependencies>
337-
<additionalparam>
338-
-warning 101
339-
</additionalparam>
328+
<additionalOptions>
329+
<additionalOption>-warning 101</additionalOption>
330+
</additionalOptions>
340331
<useStandardDocletOptions>false</useStandardDocletOptions>
341332
<additionalJOption>-J-Xmx1024m</additionalJOption>
333+
<doclint>none</doclint>
342334
</configuration>
343335
</plugin>
344336

0 commit comments

Comments
 (0)