Skip to content

Commit ddd11b5

Browse files
committed
Remove obsolete javadoc workarounds
The javadoc bug with the -use flag has since been fixed. The maven-site-plugin bug not respecting javadoc config from pluginManagement has also been fixed.
1 parent e20435c commit ddd11b5

File tree

1 file changed

+0
-74
lines changed

1 file changed

+0
-74
lines changed

pom.xml

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -405,19 +405,9 @@
405405

406406
<plugin>
407407
<artifactId>maven-javadoc-plugin</artifactId>
408-
<!--
409-
NB: The same version declaration and configuration block also appears
410-
in the <reporting> section, and must be kept in sync.
411-
-->
412408
<version>${maven-javadoc-plugin.version}</version>
413409
<configuration>
414410
<maxmemory>1024m</maxmemory>
415-
<!--
416-
Workaround for javadoc bug when classes in the default
417-
package access classes from non-default packages. See:
418-
https://bugs.java.com/bugdatabase/view_bug.do?bug_id=5101868
419-
-->
420-
<use>false</use>
421411
<links>
422412
<!-- Core Java. -->
423413
<link>${scijava.javadoc.url.java}</link>
@@ -1009,70 +999,6 @@
1009999
<!-- Generate javadocs as part of site generation. -->
10101000
<plugin>
10111001
<artifactId>maven-javadoc-plugin</artifactId>
1012-
<!--
1013-
NB: The following version declaration and configuration block are fully
1014-
replicated from the pluginManagement section. This is necessary because
1015-
many versions of maven-site-plugin (including 3.3) do not respect the
1016-
pluginManagement values.
1017-
See: https://issues.apache.org/jira/browse/MSITE-443
1018-
While the maven-site-plugin documentation states that it "search[es]
1019-
the same groupId/artifactId in the build.pluginManagement.plugins
1020-
section", this claim unfortunately does not seem to reflect reality.
1021-
-->
1022-
<version>${maven-javadoc-plugin.version}</version>
1023-
<configuration>
1024-
<maxmemory>1024m</maxmemory>
1025-
<!--
1026-
Workaround for javadoc bug when classes in the default
1027-
package access classes from non-default packages.
1028-
See: https://bugs.java.com/bugdatabase/view_bug.do?bug_id=5101868
1029-
-->
1030-
<use>false</use>
1031-
<links>
1032-
<!-- Core Java. -->
1033-
<link>${scijava.javadoc.url.java}</link>
1034-
<link>${scijava.javadoc.url.javafx}</link>
1035-
<!-- SciJava and related projects and forks. -->
1036-
<link>https://javadoc.scijava.org/SciJava/</link>
1037-
<link>https://javadoc.scijava.org/Alida/</link>
1038-
<link>https://javadoc.scijava.org/Bio-Formats/</link>
1039-
<link>https://javadoc.scijava.org/FLIMLib/</link>
1040-
<link>https://javadoc.scijava.org/Fiji/</link>
1041-
<link>https://javadoc.scijava.org/Icy/</link>
1042-
<link>https://javadoc.scijava.org/ImageJ/</link>
1043-
<link>https://javadoc.scijava.org/ImageJ1/</link>
1044-
<link>https://javadoc.scijava.org/ImgLib2/</link>
1045-
<link>https://javadoc.scijava.org/Java3D/</link>
1046-
<link>https://javadoc.scijava.org/KNIME/</link>
1047-
<link>https://javadoc.scijava.org/LOCI/</link>
1048-
<link>https://javadoc.scijava.org/MiToBo/</link>
1049-
<link>https://javadoc.scijava.org/Micro-Manager-Core/</link>
1050-
<link>https://javadoc.scijava.org/Micro-Manager-Studio/</link>
1051-
<link>https://javadoc.scijava.org/MorphoLibJ/</link>
1052-
<link>https://javadoc.scijava.org/OMERO/</link>
1053-
<link>https://javadoc.scijava.org/SCIFIO/</link>
1054-
<!-- Third party projects. -->
1055-
<link>https://javadoc.scijava.org/Apache-Commons-IO/</link>
1056-
<link>https://javadoc.scijava.org/Apache-Commons-Lang/</link>
1057-
<link>https://javadoc.scijava.org/Apache-Commons-Math/</link>
1058-
<link>https://javadoc.scijava.org/Apache-Commons-Text/</link>
1059-
<link>https://javadoc.scijava.org/BoneJ/</link>
1060-
<link>https://javadoc.scijava.org/Eclipse/</link>
1061-
<link>https://javadoc.scijava.org/Guava/</link>
1062-
<link>https://javadoc.scijava.org/JAMA/</link>
1063-
<link>https://javadoc.scijava.org/JFreeChart/</link>
1064-
<link>https://javadoc.scijava.org/JGraphT/</link>
1065-
<link>https://javadoc.scijava.org/JHotDraw/</link>
1066-
<link>https://javadoc.scijava.org/JOML/</link>
1067-
<link>https://javadoc.scijava.org/Javassist/</link>
1068-
<link>https://javadoc.scijava.org/MigLayout/</link>
1069-
<link>https://javadoc.scijava.org/NetBeans/</link>
1070-
<link>https://javadoc.scijava.org/Pivot/</link>
1071-
<link>https://javadoc.scijava.org/VisAD/</link>
1072-
<link>https://javadoc.scijava.org/Weka/</link>
1073-
<link>https://javadoc.scijava.org/ojAlgo/</link>
1074-
</links>
1075-
</configuration>
10761002
</plugin>
10771003
</plugins>
10781004
</reporting>

0 commit comments

Comments
 (0)