[maven-javadoc-plugin] 20/23: Add back the maven-plugin-plugin configuration in the pom

[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 51765ea6c3d94907a879f4c6b83f57f7f3736c5e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Mar 16 15:11:12 2015 +0100

    Add back the maven-plugin-plugin configuration in the pom
---
 debian/changelog                                   |  4 ++-
 .../missing-maven-plugin-plugin-declaration.patch  | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0bc0e87..26bd191 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-maven-javadoc-plugin (2.9.1-3) UNRELEASED; urgency=medium
+maven-javadoc-plugin (2.10.2-1) UNRELEASED; urgency=medium
 
+  * Team upload.
+  * New upstream release
   * Moved the package to Git
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 16 Mar 2015 09:40:14 +0100
diff --git a/debian/patches/missing-maven-plugin-plugin-declaration.patch b/debian/patches/missing-maven-plugin-plugin-declaration.patch
new file mode 100644
index 0000000..d941794
--- /dev/null
+++ b/debian/patches/missing-maven-plugin-plugin-declaration.patch
@@ -0,0 +1,37 @@
+Description: Add back the maven-plugin-plugin configuration which has been moved to the parent pom.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -277,6 +277,13 @@
+       <plugins>
+         <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
++          <artifactId>maven-plugin-plugin</artifactId>
++          <configuration>
++            <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
++          </configuration>
++        </plugin>
++        <plugin>
++          <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-shade-plugin</artifactId>
+           <version>1.7.1</version>
+         </plugin>
+@@ -321,6 +328,17 @@
+         </configuration>
+       </plugin>
+       <plugin>
++        <artifactId>maven-plugin-plugin</artifactId>
++        <executions>
++          <execution>
++            <id>generate-descriptor</id>
++            <goals>
++              <goal>descriptor</goal>
++            </goals>
++          </execution>
++        </executions>
++      </plugin>
++      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-surefire-plugin</artifactId>
+         <configuration>
diff --git a/debian/patches/series b/debian/patches/series
index 6ee6e9e..12780b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 doxia1_1.patch
 plexus-utils2-compatibility.patch
 fix-unmappable-characters.patch
+missing-maven-plugin-plugin-declaration.patch

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