From 0d178a8e4a8f98009e7e7a18328a1caac7deeb2d Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Wed, 24 Jun 2020 13:34:14 +0900
Subject: [PATCH 1/6] HADOOP-16862. [JDK11] Support JavaDoc.

---
 hadoop-project/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 4e819cd896a2c..a7ea6ca5f3338 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -2399,6 +2399,7 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <configuration>
+              <source>8</source>
               <additionalOptions>
                 <!-- TODO: remove -html4 option to generate html5 docs when we stop supporting JDK8 -->
                 <additionalOption>-html4</additionalOption>

From 7fccf7c8e9ddb0b737546d36c6e9c35091c991a6 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Wed, 24 Jun 2020 21:31:32 +0900
Subject: [PATCH 2/6] Update Jenkinsfile to use YETUS-972

---
 Jenkinsfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0461c5727aff9..f1be5b01b1c91 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,7 +35,7 @@ pipeline {
         DOCKERFILE = "${SOURCEDIR}/dev-support/docker/Dockerfile"
         YETUS='yetus'
         // Branch or tag name.  Yetus release tags are 'rel/X.Y.Z'
-        YETUS_VERSION='rel/0.12.0'
+        YETUS_VERSION='YETUS-972'
     }
 
     parameters {
@@ -51,7 +51,7 @@ pipeline {
                     checkout([
                         $class: 'GitSCM',
                         branches: [[name: "${env.YETUS_VERSION}"]],
-                        userRemoteConfigs: [[ url: 'https://github.com/apache/yetus.git']]]
+                        userRemoteConfigs: [[ url: 'https://github.com/aajisaka/yetus.git']]]
                     )
                 }
             }
@@ -159,7 +159,8 @@ pipeline {
                         YETUS_ARGS+=("--multijdkdirs=/usr/lib/jvm/java-11-openjdk-amd64")
                         YETUS_ARGS+=("--multijdktests=compile")
 
-                        "${TESTPATCHBIN}" "${YETUS_ARGS[@]}"
+                        # custom javadoc goal
+                        YETUS_ARGS+=("--mvn-javadoc=process-sources javadoc:javadoc-no-fork")
                         '''
                 }
             }

From c67a6f70a5e0e890f1e3744da175b41ad19fb566 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Wed, 24 Jun 2020 21:33:26 +0900
Subject: [PATCH 3/6] Add back wrongly removed option

---
 Jenkinsfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index f1be5b01b1c91..6d33c42af766d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -161,6 +161,8 @@ pipeline {
 
                         # custom javadoc goal
                         YETUS_ARGS+=("--mvn-javadoc=process-sources javadoc:javadoc-no-fork")
+
+                        "${TESTPATCHBIN}" "${YETUS_ARGS[@]}"
                         '''
                 }
             }

From fe56f95baf5e8362d10b3d474f4adabfef831baf Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Thu, 25 Jun 2020 02:32:29 +0900
Subject: [PATCH 4/6] Reflect the update in YETUS-972

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6d33c42af766d..f58e65b2c011b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -159,8 +159,8 @@ pipeline {
                         YETUS_ARGS+=("--multijdkdirs=/usr/lib/jvm/java-11-openjdk-amd64")
                         YETUS_ARGS+=("--multijdktests=compile")
 
-                        # custom javadoc goal
-                        YETUS_ARGS+=("--mvn-javadoc=process-sources javadoc:javadoc-no-fork")
+                        # custom javadoc goals
+                        YETUS_ARGS+=("--mvn-javadoc-goals=process-sources,javadoc:javadoc-no-fork")
 
                         "${TESTPATCHBIN}" "${YETUS_ARGS[@]}"
                         '''

From a5e9d24e73b5946915f2d13e585c6dda7c8fbe08 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Tue, 30 Jun 2020 02:13:50 +0900
Subject: [PATCH 5/6] Use Yetus master

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f58e65b2c011b..7b5b15482f226 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,7 +35,7 @@ pipeline {
         DOCKERFILE = "${SOURCEDIR}/dev-support/docker/Dockerfile"
         YETUS='yetus'
         // Branch or tag name.  Yetus release tags are 'rel/X.Y.Z'
-        YETUS_VERSION='YETUS-972'
+        YETUS_VERSION='master'
     }
 
     parameters {
@@ -51,7 +51,7 @@ pipeline {
                     checkout([
                         $class: 'GitSCM',
                         branches: [[name: "${env.YETUS_VERSION}"]],
-                        userRemoteConfigs: [[ url: 'https://github.com/aajisaka/yetus.git']]]
+                        userRemoteConfigs: [[ url: 'https://github.com/apache/yetus.git']]]
                     )
                 }
             }

From cfd4d51beede36df2f2df8aee8835ff3063c4000 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Wed, 15 Jul 2020 16:03:16 +0900
Subject: [PATCH 6/6] Skip failing modules in jdk11

---
 hadoop-common-project/hadoop-common/pom.xml    | 1 +
 hadoop-hdfs-project/hadoop-hdfs-client/pom.xml | 1 +
 hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml    | 1 +
 hadoop-hdfs-project/hadoop-hdfs/pom.xml        | 1 +
 hadoop-project/pom.xml                         | 2 ++
 hadoop-tools/hadoop-aws/pom.xml                | 1 +
 6 files changed, 7 insertions(+)

diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index 9bb70ac76a06a..fb4193a074a33 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -35,6 +35,7 @@
     <is.hadoop.common.component>true</is.hadoop.common.component>
     <wsce.config.dir>../etc/hadoop</wsce.config.dir>
     <wsce.config.file>wsce-site.xml</wsce.config.file>
+    <javadoc.skip.jdk11>true</javadoc.skip.jdk11>
   </properties>
 
 
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
index d65e6030369b3..c4bc07f29c431 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
@@ -31,6 +31,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <properties>
     <hadoop.component>hdfs</hadoop.component>
+    <javadoc.skip.jdk11>true</javadoc.skip.jdk11>
   </properties>
 
   <dependencies>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml
index 782f28a0ef30e..489458ca97352 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml
@@ -31,6 +31,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <properties>
     <hadoop.component>hdfs</hadoop.component>
+    <javadoc.skip.jdk11>true</javadoc.skip.jdk11>
   </properties>
 
   <dependencies>
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index e1ea5840deda5..5b50062a31666 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -32,6 +32,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <properties>
     <hadoop.component>hdfs</hadoop.component>
     <is.hadoop.component>true</is.hadoop.component>
+    <javadoc.skip.jdk11>true</javadoc.skip.jdk11>
   </properties>
 
   <dependencies>
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index a7ea6ca5f3338..f816b5cc0933a 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -152,6 +152,7 @@
 
     <!-- define the Java language version used by the compiler -->
     <javac.version>1.8</javac.version>
+    <javadoc.skip.jdk11>false</javadoc.skip.jdk11>
 
     <!-- The java version enforced by the maven enforcer -->
     <!-- more complex patterns can be used here, such as
@@ -2399,6 +2400,7 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <configuration>
+              <skip>${javadoc.skip.jdk11}</skip>
               <source>8</source>
               <additionalOptions>
                 <!-- TODO: remove -html4 option to generate html5 docs when we stop supporting JDK8 -->
diff --git a/hadoop-tools/hadoop-aws/pom.xml b/hadoop-tools/hadoop-aws/pom.xml
index 2383da9c104c7..5cdaf26007f7a 100644
--- a/hadoop-tools/hadoop-aws/pom.xml
+++ b/hadoop-tools/hadoop-aws/pom.xml
@@ -35,6 +35,7 @@
     <file.encoding>UTF-8</file.encoding>
     <downloadSources>true</downloadSources>
     <hadoop.tmp.dir>${project.build.directory}/test</hadoop.tmp.dir>
+    <javadoc.skip.jdk11>true</javadoc.skip.jdk11>
 
     <!-- are scale tests enabled ? -->
     <fs.s3a.scale.test.enabled>unset</fs.s3a.scale.test.enabled>