Fix javadoc generation on JDK >= 8 (#67)

This commit is contained in:
Fritz Elfert 2020-04-16 13:23:31 +02:00 committed by Andrew Gaul
parent e66bffa521
commit 876269427b
2 changed files with 17 additions and 0 deletions

View File

@ -83,6 +83,9 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalparam>${javadoc.opts}</additionalparam>
</configuration>
<executions> <executions>
<execution> <execution>
<id>javadoc</id> <id>javadoc</id>

View File

@ -886,6 +886,7 @@
<encoding>${project.build.sourceEncoding}</encoding> <encoding>${project.build.sourceEncoding}</encoding>
<quiet>true</quiet> <quiet>true</quiet>
<maxmemory>512m</maxmemory> <maxmemory>512m</maxmemory>
<additionalparam>${javadoc.opts}</additionalparam>
</configuration> </configuration>
<reportSets> <reportSets>
<reportSet> <reportSet>
@ -987,6 +988,7 @@
<maxmemory>512m</maxmemory> <maxmemory>512m</maxmemory>
<encoding>${project.build.sourceEncoding}</encoding> <encoding>${project.build.sourceEncoding}</encoding>
<quiet>true</quiet> <quiet>true</quiet>
<additionalparam>${javadoc.opts}</additionalparam>
<links> <links>
<link>https://download.oracle.com/javase/6/docs/api/</link> <link>https://download.oracle.com/javase/6/docs/api/</link>
</links> </links>
@ -1208,6 +1210,15 @@
</plugins> </plugins>
</reporting> </reporting>
<profiles> <profiles>
<profile>
<id>disable-doclint</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
<properties>
<javadoc.opts>-Xdoclint:none</javadoc.opts>
</properties>
</profile>
<profile> <profile>
<id>live</id> <id>live</id>
<build> <build>
@ -1421,6 +1432,9 @@
<plugin> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version> <version>2.9</version>
<configuration>
<additionalparam>${javadoc.opts}</additionalparam>
</configuration>
<executions> <executions>
<execution> <execution>
<id>javadoc</id> <id>javadoc</id>