Browse Source

HADOOP-17091. [JDK11] Fix Javadoc errors (#2098)

Akira Ajisaka 4 years ago
parent
commit
c40cbc57fa

+ 4 - 1
Jenkinsfile

@@ -35,7 +35,7 @@ pipeline {
         DOCKERFILE = "${SOURCEDIR}/dev-support/docker/Dockerfile"
         DOCKERFILE = "${SOURCEDIR}/dev-support/docker/Dockerfile"
         YETUS='yetus'
         YETUS='yetus'
         // Branch or tag name.  Yetus release tags are 'rel/X.Y.Z'
         // Branch or tag name.  Yetus release tags are 'rel/X.Y.Z'
-        YETUS_VERSION='rel/0.12.0'
+        YETUS_VERSION='master'
     }
     }
 
 
     parameters {
     parameters {
@@ -159,6 +159,9 @@ pipeline {
                         YETUS_ARGS+=("--multijdkdirs=/usr/lib/jvm/java-11-openjdk-amd64")
                         YETUS_ARGS+=("--multijdkdirs=/usr/lib/jvm/java-11-openjdk-amd64")
                         YETUS_ARGS+=("--multijdktests=compile")
                         YETUS_ARGS+=("--multijdktests=compile")
 
 
+                        # custom javadoc goals
+                        YETUS_ARGS+=("--mvn-javadoc-goals=process-sources,javadoc:javadoc-no-fork")
+
                         "${TESTPATCHBIN}" "${YETUS_ARGS[@]}"
                         "${TESTPATCHBIN}" "${YETUS_ARGS[@]}"
                         '''
                         '''
                 }
                 }

+ 1 - 0
hadoop-common-project/hadoop-common/pom.xml

@@ -35,6 +35,7 @@
     <is.hadoop.common.component>true</is.hadoop.common.component>
     <is.hadoop.common.component>true</is.hadoop.common.component>
     <wsce.config.dir>../etc/hadoop</wsce.config.dir>
     <wsce.config.dir>../etc/hadoop</wsce.config.dir>
     <wsce.config.file>wsce-site.xml</wsce.config.file>
     <wsce.config.file>wsce-site.xml</wsce.config.file>
+    <javadoc.skip.jdk11>true</javadoc.skip.jdk11>
   </properties>
   </properties>
 
 
 
 

+ 1 - 0
hadoop-hdfs-project/hadoop-hdfs-client/pom.xml

@@ -31,6 +31,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 
   <properties>
   <properties>
     <hadoop.component>hdfs</hadoop.component>
     <hadoop.component>hdfs</hadoop.component>
+    <javadoc.skip.jdk11>true</javadoc.skip.jdk11>
   </properties>
   </properties>
 
 
   <dependencies>
   <dependencies>

+ 1 - 0
hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml

@@ -31,6 +31,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 
   <properties>
   <properties>
     <hadoop.component>hdfs</hadoop.component>
     <hadoop.component>hdfs</hadoop.component>
+    <javadoc.skip.jdk11>true</javadoc.skip.jdk11>
   </properties>
   </properties>
 
 
   <dependencies>
   <dependencies>

+ 1 - 0
hadoop-hdfs-project/hadoop-hdfs/pom.xml

@@ -32,6 +32,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <properties>
   <properties>
     <hadoop.component>hdfs</hadoop.component>
     <hadoop.component>hdfs</hadoop.component>
     <is.hadoop.component>true</is.hadoop.component>
     <is.hadoop.component>true</is.hadoop.component>
+    <javadoc.skip.jdk11>true</javadoc.skip.jdk11>
   </properties>
   </properties>
 
 
   <dependencies>
   <dependencies>

+ 3 - 0
hadoop-project/pom.xml

@@ -152,6 +152,7 @@
 
 
     <!-- define the Java language version used by the compiler -->
     <!-- define the Java language version used by the compiler -->
     <javac.version>1.8</javac.version>
     <javac.version>1.8</javac.version>
+    <javadoc.skip.jdk11>false</javadoc.skip.jdk11>
 
 
     <!-- The java version enforced by the maven enforcer -->
     <!-- The java version enforced by the maven enforcer -->
     <!-- more complex patterns can be used here, such as
     <!-- more complex patterns can be used here, such as
@@ -2399,6 +2400,8 @@
             <groupId>org.apache.maven.plugins</groupId>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <configuration>
             <configuration>
+              <skip>${javadoc.skip.jdk11}</skip>
+              <source>8</source>
               <additionalOptions>
               <additionalOptions>
                 <!-- TODO: remove -html4 option to generate html5 docs when we stop supporting JDK8 -->
                 <!-- TODO: remove -html4 option to generate html5 docs when we stop supporting JDK8 -->
                 <additionalOption>-html4</additionalOption>
                 <additionalOption>-html4</additionalOption>

+ 1 - 0
hadoop-tools/hadoop-aws/pom.xml

@@ -35,6 +35,7 @@
     <file.encoding>UTF-8</file.encoding>
     <file.encoding>UTF-8</file.encoding>
     <downloadSources>true</downloadSources>
     <downloadSources>true</downloadSources>
     <hadoop.tmp.dir>${project.build.directory}/test</hadoop.tmp.dir>
     <hadoop.tmp.dir>${project.build.directory}/test</hadoop.tmp.dir>
+    <javadoc.skip.jdk11>true</javadoc.skip.jdk11>
 
 
     <!-- are scale tests enabled ? -->
     <!-- are scale tests enabled ? -->
     <fs.s3a.scale.test.enabled>unset</fs.s3a.scale.test.enabled>
     <fs.s3a.scale.test.enabled>unset</fs.s3a.scale.test.enabled>