[maven-plugin-tools] 02/08: Backported the fix for MPLUGIN-238

[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-plugin-tools.

commit 845ef8afef08a77fe7542d3423ff435cf9d5bc7a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jan 28 09:19:01 2016 +0100

    Backported the fix for MPLUGIN-238
---
 debian/changelog                    |  2 ++
 debian/patches/07-MPLUGIN-238.patch | 15 +++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2635fb2..bd83b2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ maven-plugin-tools (3.3-4) UNRELEASED; urgency=medium
 
   * Team upload.
   * Build with maven-debian-helper
+  * Backported the fix for MPLUGIN-238 (HelpMojo fails when using
+    java-annotations without any configuration)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 27 Jan 2016 10:08:59 +0100
 
diff --git a/debian/patches/07-MPLUGIN-238.patch b/debian/patches/07-MPLUGIN-238.patch
new file mode 100644
index 0000000..4cc4d9d
--- /dev/null
+++ b/debian/patches/07-MPLUGIN-238.patch
@@ -0,0 +1,15 @@
+Description: Avoid HelpMojo failure when using java-annotations without any configuration
+Origin: backport, http://svn.apache.org/r1599050
+Bug: https://issues.apache.org/jira/browse/MPLUGIN-238
+--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java
++++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java
+@@ -85,6 +85,9 @@
+     public void execute()
+         throws MojoExecutionException
+     {
++        // force value for this plugin
++        skipErrorNoDescriptorsFound = true;
++
+         super.execute();
+ 
+         if ( !project.getCompileSourceRoots().contains( outputDirectory.getAbsolutePath() ) && !skip )
diff --git a/debian/patches/series b/debian/patches/series
index a75eeb0..5c33b2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 04-reproducible-plugin-descriptor.patch
 05-fix-plugin-annotation.patch
 06-plexus-component-metadata-version.patch
+07-MPLUGIN-238.patch

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