|
553 | 553 | comes in via hbase-thirdparty hbase-shaded-netty--> |
554 | 554 | <netty.hadoop.version>3.6.2.Final</netty.hadoop.version> |
555 | 555 | <!-- end HBASE-15925 default hadoop compatibility values --> |
556 | | - <audience-annotations.version>0.5.0</audience-annotations.version> |
| 556 | + <audience-annotations.version>0.13.0</audience-annotations.version> |
| 557 | + <!-- |
| 558 | + The version used when generating javadoc, 0.13.0 is the latest version which supports jdk8. |
| 559 | + When building with jdk11, we will use 0.14.1, please see the build-with-jdk11 profile. |
| 560 | + --> |
| 561 | + <javadoc.audience-annotations.version>0.13.0</javadoc.audience-annotations.version> |
557 | 562 | <avro.version>1.7.7</avro.version> |
558 | 563 | <caffeine.version>2.8.1</caffeine.version> |
559 | 564 | <commons-codec.version>1.13</commons-codec.version> |
|
697 | 702 | this parameter by invoking mvn with -Dbuild.id=$BUILD_ID--> |
698 | 703 | <build.id>${maven.build.timestamp}</build.id> |
699 | 704 | <shell-executable>bash</shell-executable> |
700 | | - <!-- TODO HBASE-15041 clean up our javadocs so jdk8 linter can be used. |
701 | | - property as of javadoc-plugin 3.0.0 --> |
| 705 | + <!-- Still need this to ignore some errors when building javadoc--> |
702 | 706 | <doclint>none</doclint> |
703 | 707 | </properties> |
704 | 708 | <!-- Sorted by groups of dependencies then groupId and artifactId --> |
|
1452 | 1456 | <groupId>org.apache.maven.plugins</groupId> |
1453 | 1457 | <artifactId>maven-compiler-plugin</artifactId> |
1454 | 1458 | <configuration> |
1455 | | - <source>${compileSource}</source> |
1456 | | - <target>${compileSource}</target> |
1457 | 1459 | <showWarnings>true</showWarnings> |
1458 | 1460 | <showDeprecation>false</showDeprecation> |
1459 | 1461 | <useIncrementalCompilation>false</useIncrementalCompilation> |
|
2487 | 2489 | <docletArtifact> |
2488 | 2490 | <groupId>org.apache.yetus</groupId> |
2489 | 2491 | <artifactId>audience-annotations</artifactId> |
2490 | | - <version>${audience-annotations.version}</version> |
| 2492 | + <version>${javadoc.audience-annotations.version}</version> |
2491 | 2493 | </docletArtifact> |
2492 | 2494 | <useStandardDocletOptions>true</useStandardDocletOptions> |
2493 | 2495 | <destDir>apidocs</destDir> |
|
2544 | 2546 | <docletArtifact> |
2545 | 2547 | <groupId>org.apache.yetus</groupId> |
2546 | 2548 | <artifactId>audience-annotations</artifactId> |
2547 | | - <version>${audience-annotations.version}</version> |
| 2549 | + <version>${javadoc.audience-annotations.version}</version> |
2548 | 2550 | </docletArtifact> |
2549 | 2551 | <useStandardDocletOptions>true</useStandardDocletOptions> |
2550 | 2552 | <destDir>testapidocs</destDir> |
|
2645 | 2647 | <profile> |
2646 | 2648 | <id>build-with-jdk8</id> |
2647 | 2649 | <activation> |
2648 | | - <jdk>[1.8,)</jdk> |
| 2650 | + <jdk>1.8</jdk> |
2649 | 2651 | </activation> |
2650 | | - <build> |
2651 | | - <pluginManagement> |
2652 | | - <plugins/> |
2653 | | - </pluginManagement> |
2654 | | - </build> |
| 2652 | + <properties> |
| 2653 | + <maven.compiler.source>${compileSource}</maven.compiler.source> |
| 2654 | + <maven.compiler.target>${compileSource}</maven.compiler.target> |
| 2655 | + </properties> |
2655 | 2656 | </profile> |
2656 | 2657 | <profile> |
2657 | 2658 | <id>build-with-jdk11</id> |
2658 | 2659 | <activation> |
2659 | | - <jdk>[1.11,)</jdk> |
| 2660 | + <jdk>[11,)</jdk> |
2660 | 2661 | </activation> |
2661 | 2662 | <properties> |
2662 | 2663 | <maven.compiler.release>${releaseTarget}</maven.compiler.release> |
|
2669 | 2670 | TODO: replicate logic for windows |
2670 | 2671 | --> |
2671 | 2672 | <surefire.Xmx>2200m</surefire.Xmx> |
| 2673 | + <!-- |
| 2674 | + com.sun.javadoc and com.sun.tools.doclets are both deprecated in java 11 and will |
| 2675 | + fail the javadoc generating, so we need to use yetus 0.14.1 where it uses jdk.javadoc |
| 2676 | + and jdk.javadoc.doclet instead |
| 2677 | + --> |
| 2678 | + <javadoc.audience-annotations.version>0.14.1</javadoc.audience-annotations.version> |
2672 | 2679 | </properties> |
2673 | 2680 | <build> |
| 2681 | + <pluginManagement> |
| 2682 | + <plugins> |
| 2683 | + <plugin> |
| 2684 | + <groupId>org.apache.maven.plugins</groupId> |
| 2685 | + <artifactId>maven-javadoc-plugin</artifactId> |
| 2686 | + <version>${maven.javadoc.version}</version> |
| 2687 | + <configuration> |
| 2688 | + <source>${compileSource}</source> |
| 2689 | + <!-- |
| 2690 | + Need to add this option to ignore the source errors, epsecially that we reference |
| 2691 | + test code in hbase-testing-util's main code. |
| 2692 | + --> |
| 2693 | + <additionalOptions>--ignore-source-errors</additionalOptions> |
| 2694 | + <additionalJOptions> |
| 2695 | + <additionalJOption>-J-Xmx2G</additionalJOption> |
| 2696 | + <additionalJOption>-J--add-exports</additionalJOption> |
| 2697 | + <additionalJOption>-Jjdk.javadoc/jdk.javadoc.internal.tool=ALL-UNNAMED</additionalJOption> |
| 2698 | + </additionalJOptions> |
| 2699 | + </configuration> |
| 2700 | + </plugin> |
| 2701 | + </plugins> |
| 2702 | + </pluginManagement> |
2674 | 2703 | <plugins> |
2675 | 2704 | <plugin> |
2676 | 2705 | <groupId>org.apache.maven.plugins</groupId> |
|
0 commit comments