You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2020/08/03 01:47:15 UTC
[hadoop] branch trunk updated: HADOOP-17091. [JDK11] Fix Javadoc
errors (#2098)
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new c40cbc5 HADOOP-17091. [JDK11] Fix Javadoc errors (#2098)
c40cbc5 is described below
commit c40cbc57fa20d385a971a4b07af13fa28d5908c9
Author: Akira Ajisaka <aa...@apache.org>
AuthorDate: Mon Aug 3 10:46:51 2020 +0900
HADOOP-17091. [JDK11] Fix Javadoc errors (#2098)
---
Jenkinsfile | 5 ++++-
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 | 3 +++
hadoop-tools/hadoop-aws/pom.xml | 1 +
7 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 0461c57..7b5b154 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='master'
}
parameters {
@@ -159,6 +159,9 @@ pipeline {
YETUS_ARGS+=("--multijdkdirs=/usr/lib/jvm/java-11-openjdk-amd64")
YETUS_ARGS+=("--multijdktests=compile")
+ # custom javadoc goals
+ YETUS_ARGS+=("--mvn-javadoc-goals=process-sources,javadoc:javadoc-no-fork")
+
"${TESTPATCHBIN}" "${YETUS_ARGS[@]}"
'''
}
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index 9bb70ac..fb4193a 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 d65e603..c4bc07f 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 782f28a..489458c 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 e1ea584..5b50062 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 7b7aab9..06fcee3 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,8 @@
<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 -->
<additionalOption>-html4</additionalOption>
diff --git a/hadoop-tools/hadoop-aws/pom.xml b/hadoop-tools/hadoop-aws/pom.xml
index 2383da9..5cdaf26 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>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org