Skip to content

Commit 6b4233e

Browse files
committed
Add Javadoc option on Java 11 to avoid 404
(cherry picked from commit cd337c4)
1 parent 7b677fe commit 6b4233e

File tree

1 file changed

+32
-4
lines changed

1 file changed

+32
-4
lines changed

pom.xml

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<groovy.all.version>2.4.8</groovy.all.version>
6161
<keytool.maven.plugin.version>1.5</keytool.maven.plugin.version>
6262
<maven.sources.plugin.version>3.0.1</maven.sources.plugin.version>
63-
<maven.javadoc.plugin.version>3.0.0-M1</maven.javadoc.plugin.version>
63+
<maven.javadoc.plugin.version>3.0.1</maven.javadoc.plugin.version>
6464
<maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
6565
<maven.packagecloud.wagon.version>0.0.6</maven.packagecloud.wagon.version>
6666
<checksum.maven.plugin.version>1.8</checksum.maven.plugin.version>
@@ -201,6 +201,17 @@
201201
</configuration>
202202
</plugin>
203203

204+
<plugin>
205+
<groupId>org.apache.maven.plugins</groupId>
206+
<artifactId>maven-javadoc-plugin</artifactId>
207+
<version>${maven.javadoc.plugin.version}</version>
208+
<configuration>
209+
<additionalOptions>${javadoc.opts}</additionalOptions>
210+
<additionalJOption>${javadoc.joption}</additionalJOption>
211+
<quiet>true</quiet>
212+
</configuration>
213+
</plugin>
214+
204215
<plugin>
205216
<artifactId>maven-failsafe-plugin</artifactId>
206217
<version>${maven.failsafe.plugin.version}</version>
@@ -386,6 +397,20 @@
386397
</properties>
387398
</profile>
388399

400+
<profile>
401+
<!--
402+
We need this option in Java 11+ to avoid an
403+
extra 'undefined' segment in the URL
404+
-->
405+
<id>javadoc-no-module-dir-java-11</id>
406+
<activation>
407+
<jdk>[11,)</jdk>
408+
</activation>
409+
<properties>
410+
<javadoc.joption>--no-module-directories</javadoc.joption>
411+
</properties>
412+
</profile>
413+
389414
<profile>
390415
<id>ossrh-release</id>
391416
<build>
@@ -395,7 +420,8 @@
395420
<artifactId>maven-javadoc-plugin</artifactId>
396421
<version>${maven.javadoc.plugin.version}</version>
397422
<configuration>
398-
<additionalparam>${javadoc.opts}</additionalparam>
423+
<additionalOptions>${javadoc.opts}</additionalOptions>
424+
<additionalJOption>${javadoc.joption}</additionalJOption>
399425
<quiet>true</quiet>
400426
</configuration>
401427
<executions>
@@ -449,7 +475,8 @@
449475
<artifactId>maven-javadoc-plugin</artifactId>
450476
<version>${maven.javadoc.plugin.version}</version>
451477
<configuration>
452-
<additionalparam>${javadoc.opts}</additionalparam>
478+
<additionalOptions>${javadoc.opts}</additionalOptions>
479+
<additionalJOption>${javadoc.joption}</additionalJOption>
453480
<quiet>true</quiet>
454481
</configuration>
455482
<executions>
@@ -502,7 +529,8 @@
502529
<artifactId>maven-javadoc-plugin</artifactId>
503530
<version>${maven.javadoc.plugin.version}</version>
504531
<configuration>
505-
<additionalparam>${javadoc.opts}</additionalparam>
532+
<additionalOptions>${javadoc.opts}</additionalOptions>
533+
<additionalJOption>${javadoc.joption}</additionalJOption>
506534
<quiet>true</quiet>
507535
</configuration>
508536
<executions>

0 commit comments

Comments
 (0)