[pkg-java] r18738 - in trunk/maven-docck-plugin/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2015-06-10 20:01:43 +0000 (Wed, 10 Jun 2015)
New Revision: 18738

Added:
   trunk/maven-docck-plugin/debian/patches/
   trunk/maven-docck-plugin/debian/patches/01-maven-plugin-tools-3.3-compatibility.patch
   trunk/maven-docck-plugin/debian/patches/series
Modified:
   trunk/maven-docck-plugin/debian/changelog
Log:
Fixed the compatibility with maven-plugin-tools 3.3



Modified: trunk/maven-docck-plugin/debian/changelog
===================================================================
--- trunk/maven-docck-plugin/debian/changelog	2015-06-10 15:14:02 UTC (rev 18737)
+++ trunk/maven-docck-plugin/debian/changelog	2015-06-10 20:01:43 UTC (rev 18738)
@@ -1,3 +1,10 @@
+maven-docck-plugin (1.0-5) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fixed the compatibility with maven-plugin-tools 3.3
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 10 Jun 2015 21:55:34 +0200
+
 maven-docck-plugin (1.0-4) unstable; urgency=low
 
   * Team upload.

Added: trunk/maven-docck-plugin/debian/patches/01-maven-plugin-tools-3.3-compatibility.patch
===================================================================
--- trunk/maven-docck-plugin/debian/patches/01-maven-plugin-tools-3.3-compatibility.patch	                        (rev 0)
+++ trunk/maven-docck-plugin/debian/patches/01-maven-plugin-tools-3.3-compatibility.patch	2015-06-10 20:01:43 UTC (rev 18738)
@@ -0,0 +1,18 @@
+Description: Fixes the compatibility with maven-plugin-tools 3.3.
+ The MojoScanner.populatePluginDescriptor(MavenProject, PluginDescriptor) method
+ was deprecated in maven-plugin-tools 2.5 and replaced with
+ populatePluginDescriptor(MavenProject project). The method was eventually
+ removed in the version 3.3.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java
++++ b/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java
+@@ -66,7 +66,7 @@
+ 
+         try
+         {
+-            mojoScanner.populatePluginDescriptor( project, descriptor );
++            mojoScanner.populatePluginDescriptor( new org.apache.maven.tools.plugin.DefaultPluginToolsRequest( project, descriptor ) );
+         }
+         catch ( InvalidPluginDescriptorException e )
+         {

Added: trunk/maven-docck-plugin/debian/patches/series
===================================================================
--- trunk/maven-docck-plugin/debian/patches/series	                        (rev 0)
+++ trunk/maven-docck-plugin/debian/patches/series	2015-06-10 20:01:43 UTC (rev 18738)
@@ -0,0 +1 @@
+01-maven-plugin-tools-3.3-compatibility.patch