[maven-javadoc-plugin] 01/03: Add the --ignore-source-errors option when using the default doclet with Java 9

[Emmanuel Bourg]

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 04eb2d635896cb56bb0c3a2fa1ed0bf2fe2c0373
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Mar 28 15:26:07 2018 +0200

    Add the --ignore-source-errors option when using the default doclet with Java 9
---
 debian/changelog                          |  8 ++++++++
 debian/patches/ignore-source-errors.patch | 19 +++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ed0ed35..00e2e61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+maven-javadoc-plugin (3.0.0-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Add the --ignore-source-errors option when using the default doclet
+    with Java 9
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 28 Mar 2018 15:25:12 +0200
+
 maven-javadoc-plugin (3.0.0-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/ignore-source-errors.patch b/debian/patches/ignore-source-errors.patch
new file mode 100644
index 0000000..6495d7e
--- /dev/null
+++ b/debian/patches/ignore-source-errors.patch
@@ -0,0 +1,19 @@
+Description: Ignore source errors when using the default doclet with Java 9
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
++++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+@@ -4856,6 +4856,13 @@
+                 arguments.add( option );
+             }
+         }
++
++        // ignore source errors when using the default doclet with Java 9
++        if ( doclet == null && SystemUtils.IS_JAVA_1_9 && !arguments.contains( "--ignore-source-errors" ) )
++        {
++            getLog().info("Adding the --ignore-source-errors option");
++            arguments.add( "--ignore-source-errors" );
++        }
+     }
+ 
+     private File findMainDescriptor( Collection<String> roots )
diff --git a/debian/patches/series b/debian/patches/series
index ee33b91..686c389 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ reproducible-footer.patch
 openjdk-9-javadoc-path.patch
 plexus-component-metadata-plugin-version.patch
 MJAVADOC-504.patch
+ignore-source-errors.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-javadoc-plugin.git