Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 3, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0d178a8
HADOOP-16862. [JDK11] Support JavaDoc.
aajisaka Jun 24, 2020
7fccf7c
Update Jenkinsfile to use YETUS-972
aajisaka Jun 24, 2020
c67a6f7
Add back wrongly removed option
aajisaka Jun 24, 2020
fe56f95
Reflect the update in YETUS-972
aajisaka Jun 24, 2020
a5e9d24
Use Yetus master
aajisaka Jun 29, 2020
cfd4d51
Skip failing modules in jdk11
aajisaka Jul 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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[@]}"
'''
}
Expand Down
1 change: 1 addition & 0 deletions hadoop-common-project/hadoop-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>


Expand Down
1 change: 1 addition & 0 deletions hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions hadoop-hdfs-project/hadoop-hdfs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions hadoop-project/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions hadoop-tools/hadoop-aws/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down