Repository: hadoop Updated Branches: refs/heads/trunk 78a0d173e -> f796cfde7
HADOOP-15304. [JDK10] Migrate from com.sun.tools.doclets to the replacement. Contributed by Akira Ajisaka. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f796cfde Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f796cfde Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f796cfde Branch: refs/heads/trunk Commit: f796cfde76519c79ec5d0775e5930ed5e19b0ba6 Parents: 78a0d17 Author: Takanobu Asanuma <tasan...@apache.org> Authored: Tue Sep 18 18:48:25 2018 +0900 Committer: Takanobu Asanuma <tasan...@apache.org> Committed: Tue Sep 18 18:48:25 2018 +0900 ---------------------------------------------------------------------- .../hadoop-annotations/pom.xml | 24 ++++++++++++++ hadoop-project-dist/pom.xml | 34 ++++++++++++++------ 2 files changed, 49 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f796cfde/hadoop-common-project/hadoop-annotations/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-annotations/pom.xml b/hadoop-common-project/hadoop-annotations/pom.xml index 64dde71..fd329e2 100644 --- a/hadoop-common-project/hadoop-annotations/pom.xml +++ b/hadoop-common-project/hadoop-annotations/pom.xml @@ -53,6 +53,30 @@ </dependency> </dependencies> </profile> + <profile> + <id>jdk10</id> + <activation> + <jdk>[10,)</jdk> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <excludes> + <exclude>org/apache/hadoop/classification/tools/</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <excludePackageNames>org.apache.hadoop.classification.tools</excludePackageNames> + </configuration> + </plugin> + </plugins> + </build> + </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/hadoop/blob/f796cfde/hadoop-project-dist/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project-dist/pom.xml b/hadoop-project-dist/pom.xml index 66afc14..fd67a71 100644 --- a/hadoop-project-dist/pom.xml +++ b/hadoop-project-dist/pom.xml @@ -115,15 +115,6 @@ <packages>org.apache.hadoop*</packages> </group> </groups> - <doclet>org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsStandardDoclet</doclet> - <docletArtifacts> - <docletArtifact> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-annotations</artifactId> - <version>${hadoop.version}</version> - </docletArtifact> - </docletArtifacts> - <useStandardDocletOptions>true</useStandardDocletOptions> <!-- switch on dependency-driven aggregation --> <includeDependencySources>false</includeDependencySources> @@ -417,5 +408,30 @@ </plugins> </build> </profile> + <profile> + <id>doclet</id> + <activation> + <jdk>(,10)</jdk> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <doclet>org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsStandardDoclet</doclet> + <docletArtifacts> + <docletArtifact> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-annotations</artifactId> + <version>${hadoop.version}</version> + </docletArtifact> + </docletArtifacts> + <useStandardDocletOptions>true</useStandardDocletOptions> + </configuration> + </plugin> + </plugins> + </build> + </profile> </profiles> </project> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org