|
60 | 60 | <groovy.all.version>2.4.8</groovy.all.version> |
61 | 61 | <keytool.maven.plugin.version>1.5</keytool.maven.plugin.version> |
62 | 62 | <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> |
64 | 64 | <maven.gpg.plugin.version>1.6</maven.gpg.plugin.version> |
65 | 65 | <maven.packagecloud.wagon.version>0.0.6</maven.packagecloud.wagon.version> |
66 | 66 | <checksum.maven.plugin.version>1.8</checksum.maven.plugin.version> |
|
201 | 201 | </configuration> |
202 | 202 | </plugin> |
203 | 203 |
|
| 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 | + |
204 | 215 | <plugin> |
205 | 216 | <artifactId>maven-failsafe-plugin</artifactId> |
206 | 217 | <version>${maven.failsafe.plugin.version}</version> |
|
386 | 397 | </properties> |
387 | 398 | </profile> |
388 | 399 |
|
| 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 | + |
389 | 414 | <profile> |
390 | 415 | <id>ossrh-release</id> |
391 | 416 | <build> |
|
395 | 420 | <artifactId>maven-javadoc-plugin</artifactId> |
396 | 421 | <version>${maven.javadoc.plugin.version}</version> |
397 | 422 | <configuration> |
398 | | - <additionalparam>${javadoc.opts}</additionalparam> |
| 423 | + <additionalOptions>${javadoc.opts}</additionalOptions> |
| 424 | + <additionalJOption>${javadoc.joption}</additionalJOption> |
399 | 425 | <quiet>true</quiet> |
400 | 426 | </configuration> |
401 | 427 | <executions> |
|
449 | 475 | <artifactId>maven-javadoc-plugin</artifactId> |
450 | 476 | <version>${maven.javadoc.plugin.version}</version> |
451 | 477 | <configuration> |
452 | | - <additionalparam>${javadoc.opts}</additionalparam> |
| 478 | + <additionalOptions>${javadoc.opts}</additionalOptions> |
| 479 | + <additionalJOption>${javadoc.joption}</additionalJOption> |
453 | 480 | <quiet>true</quiet> |
454 | 481 | </configuration> |
455 | 482 | <executions> |
|
502 | 529 | <artifactId>maven-javadoc-plugin</artifactId> |
503 | 530 | <version>${maven.javadoc.plugin.version}</version> |
504 | 531 | <configuration> |
505 | | - <additionalparam>${javadoc.opts}</additionalparam> |
| 532 | + <additionalOptions>${javadoc.opts}</additionalOptions> |
| 533 | + <additionalJOption>${javadoc.joption}</additionalJOption> |
506 | 534 | <quiet>true</quiet> |
507 | 535 | </configuration> |
508 | 536 | <executions> |
|
0 commit comments