This is an automated email from the git hooks/post-receive script. faux-guest pushed a commit to branch master in repository maven-javadoc-plugin.
commit 84495711697dbfec2d0ca45ef456f63a051b25c0 Author: Chris West (Faux) <[email protected]> Date: Wed Jul 5 18:13:42 2017 +0100 Try a different javadoc path on Java 9 I would rather check both paths, but this seems closer to what the original code is trying to do, so I left it like this as a minimal patch. Feel free to revert if I've messed up the debian packaging in any way. I checked it built in a normal cowbuilder/sid, and that the package resolves the issue on my build setup. --- debian/changelog | 7 +++++++ debian/patches/openjdk-9-javadoc-path.patch | 15 +++++++++++++++ debian/patches/series | 1 + 3 files changed, 23 insertions(+) diff --git a/debian/changelog b/debian/changelog index f741017..6890ed5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +maven-javadoc-plugin (2.10.4-2) UNRELEASED; urgency=medium + + * Fix ""Unable to find javadoc command:" on openjdk-9": search another path + if the JVM version is appropriate (Closes: #866929) + + -- Chris West <[email protected]> Wed, 05 Jul 2017 18:10:51 +0100 + maven-javadoc-plugin (2.10.4-1) unstable; urgency=medium * Team upload. diff --git a/debian/patches/openjdk-9-javadoc-path.patch b/debian/patches/openjdk-9-javadoc-path.patch new file mode 100644 index 0000000..ec47b6f --- /dev/null +++ b/debian/patches/openjdk-9-javadoc-path.patch @@ -0,0 +1,15 @@ +--- a/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java ++++ b/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java +@@ -3668,6 +3668,12 @@ + { + 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 ( SystemUtils.IS_OS_MAC_OSX && SystemUtils.JAVA_VERSION_FLOAT > 1.8f ) ++ { ++ javadocExe = ++ new File( SystemUtils.getJavaHome() + File.separator + "bin", javadocCommand ); ++ } + else + { + javadocExe = diff --git a/debian/patches/series b/debian/patches/series index 7dd77d3..766bc66 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ plexus-utils2-compatibility.patch fix-unmappable-characters.patch missing-maven-plugin-plugin-declaration.patch reproducible-footer.patch +openjdk-9-javadoc-path.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-javadoc-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
