This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository maven-javadoc-plugin.
commit b61bd254e6fef9a6558f1d383bffc29085bdbc9a
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Sun Apr 8 23:17:17 2018 +0200
Modified the patches to work with Java 9 or later (Closes: #895236)
---
debian/changelog | 7 +++++++
debian/patches/ignore-source-errors.patch | 2 +-
debian/patches/openjdk-9-javadoc-path.patch | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index aae1065..f26ca95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven-javadoc-plugin (3.0.0-4) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Modified the patches to work with Java 9 or later (Closes: #895236)
+
+ -- Emmanuel Bourg <ebo...@apache.org> Sun, 08 Apr 2018 23:16:23 +0200
+
maven-javadoc-plugin (3.0.0-3) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/ignore-source-errors.patch
b/debian/patches/ignore-source-errors.patch
index 6495d7e..0692c53 100644
--- a/debian/patches/ignore-source-errors.patch
+++ b/debian/patches/ignore-source-errors.patch
@@ -9,7 +9,7 @@ Forwarded: no
}
+
+ // ignore source errors when using the default doclet with Java 9
-+ if ( doclet == null && SystemUtils.IS_JAVA_1_9 &&
!arguments.contains( "--ignore-source-errors" ) )
++ if ( doclet == null &&
SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9) && !arguments.contains(
"--ignore-source-errors" ) )
+ {
+ getLog().info("Adding the --ignore-source-errors option");
+ arguments.add( "--ignore-source-errors" );
diff --git a/debian/patches/openjdk-9-javadoc-path.patch
b/debian/patches/openjdk-9-javadoc-path.patch
index 6ccdecd..5fe2fc1 100644
--- a/debian/patches/openjdk-9-javadoc-path.patch
+++ b/debian/patches/openjdk-9-javadoc-path.patch
@@ -5,7 +5,7 @@
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_JAVA_1_9 )
++ else if ( SystemUtils.isJavaVersionAtLeast( JavaVersion.JAVA_9 ) )
+ {
+ javadocExe =
+ new File( SystemUtils.getJavaHome() + File.separator + "bin",
javadocCommand );
--
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
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
