This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch MJAVADOC-650 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit f4f29fd62ce751ef422b0c41a0d3607d1fa22d67 Author: Chris West <[email protected]> AuthorDate: Thu Sep 10 14:31:18 2020 -0400 [MJAVADOC-650] Fix javadoc binary search for JDK 9+. Imported patch from Debian. In JDK 9 the jre directory was removed from the JDK so the lookup path should be modified. Fixes #MJAVADOC-650 --- .../java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java index 3c847ce..dc0477d 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java @@ -3799,6 +3799,12 @@ public abstract class AbstractJavadocMojo { javadocExe = new File( SystemUtils.getJavaHome() + File.separator + "bin", javadocCommand ); } + // On Java 9, this has moved to: /usr/lib/jvm/java-9-openjdk-amd64/bin/javadoc + else if ( org.apache.commons.lang3.SystemUtils.isJavaVersionAtLeast( org.apache.commons.lang3.JavaVersion.JAVA_9 ) ) + { + javadocExe = + new File( SystemUtils.getJavaHome() + File.separator + "bin", javadocCommand ); + } else { javadocExe =
