Skip to content

Commit f796cfd

Browse files
committed
HADOOP-15304. [JDK10] Migrate from com.sun.tools.doclets to the replacement. Contributed by Akira Ajisaka.
1 parent 78a0d17 commit f796cfd

File tree

2 files changed

+49
-9
lines changed
  • hadoop-common-project/hadoop-annotations
  • hadoop-project-dist

2 files changed

+49
-9
lines changed

hadoop-common-project/hadoop-annotations/pom.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,30 @@
5353
</dependency>
5454
</dependencies>
5555
</profile>
56+
<profile>
57+
<id>jdk10</id>
58+
<activation>
59+
<jdk>[10,)</jdk>
60+
</activation>
61+
<build>
62+
<plugins>
63+
<plugin>
64+
<artifactId>maven-compiler-plugin</artifactId>
65+
<configuration>
66+
<excludes>
67+
<exclude>org/apache/hadoop/classification/tools/</exclude>
68+
</excludes>
69+
</configuration>
70+
</plugin>
71+
<plugin>
72+
<artifactId>maven-javadoc-plugin</artifactId>
73+
<configuration>
74+
<excludePackageNames>org.apache.hadoop.classification.tools</excludePackageNames>
75+
</configuration>
76+
</plugin>
77+
</plugins>
78+
</build>
79+
</profile>
5680
</profiles>
5781

5882
</project>

hadoop-project-dist/pom.xml

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,6 @@
115115
<packages>org.apache.hadoop*</packages>
116116
</group>
117117
</groups>
118-
<doclet>org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsStandardDoclet</doclet>
119-
<docletArtifacts>
120-
<docletArtifact>
121-
<groupId>org.apache.hadoop</groupId>
122-
<artifactId>hadoop-annotations</artifactId>
123-
<version>${hadoop.version}</version>
124-
</docletArtifact>
125-
</docletArtifacts>
126-
<useStandardDocletOptions>true</useStandardDocletOptions>
127118

128119
<!-- switch on dependency-driven aggregation -->
129120
<includeDependencySources>false</includeDependencySources>
@@ -417,5 +408,30 @@
417408
</plugins>
418409
</build>
419410
</profile>
411+
<profile>
412+
<id>doclet</id>
413+
<activation>
414+
<jdk>(,10)</jdk>
415+
</activation>
416+
<build>
417+
<plugins>
418+
<plugin>
419+
<groupId>org.apache.maven.plugins</groupId>
420+
<artifactId>maven-javadoc-plugin</artifactId>
421+
<configuration>
422+
<doclet>org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsStandardDoclet</doclet>
423+
<docletArtifacts>
424+
<docletArtifact>
425+
<groupId>org.apache.hadoop</groupId>
426+
<artifactId>hadoop-annotations</artifactId>
427+
<version>${hadoop.version}</version>
428+
</docletArtifact>
429+
</docletArtifacts>
430+
<useStandardDocletOptions>true</useStandardDocletOptions>
431+
</configuration>
432+
</plugin>
433+
</plugins>
434+
</build>
435+
</profile>
420436
</profiles>
421437
</project>

0 commit comments

Comments
 (0)