[pkg-java] r9637 - in trunk/plexus-maven-plugin/debian: . patches

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-08-05 10:54:13 +0000 (Wed, 05 Aug 2009)
New Revision: 9637

Modified:
   trunk/plexus-maven-plugin/debian/changelog
   trunk/plexus-maven-plugin/debian/patches/descriptor.diff
Log:
Fix component descriptors

Modified: trunk/plexus-maven-plugin/debian/changelog
===================================================================
--- trunk/plexus-maven-plugin/debian/changelog	2009-08-05 10:52:44 UTC (rev 9636)
+++ trunk/plexus-maven-plugin/debian/changelog	2009-08-05 10:54:13 UTC (rev 9637)
@@ -1,3 +1,9 @@
+plexus-maven-plugin (1.3.8-4) experimental; urgency=low
+
+  * Fix component descriptors
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 28 Jul 2009 17:08:30 +0100
+
 plexus-maven-plugin (1.3.8-3) experimental; urgency=low
 
   * Change section to java, bump up Standards-Version to 3.8.1

Modified: trunk/plexus-maven-plugin/debian/patches/descriptor.diff
===================================================================
--- trunk/plexus-maven-plugin/debian/patches/descriptor.diff	2009-08-05 10:52:44 UTC (rev 9636)
+++ trunk/plexus-maven-plugin/debian/patches/descriptor.diff	2009-08-05 10:54:13 UTC (rev 9637)
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/codehaus/plexus/maven/plugin/AbstractDescriptorMojo.java
 +++ b/src/main/java/org/codehaus/plexus/maven/plugin/AbstractDescriptorMojo.java
-@@ -88,7 +88,7 @@
+@@ -88,12 +88,12 @@
      private ComponentDescriptorExtractor[] extractors;
  
      /**
@@ -9,3 +9,31 @@
       */
      private ComponentDescriptorWriter writer;
  
+     /**
+-     * @component
++     * @component role="org.apache.maven.project.MavenProjectHelper"
+      */
+     private MavenProjectHelper mavenProjectHelper;
+ 
+--- a/src/main/java/org/codehaus/plexus/maven/plugin/AbstractMergeMojo.java
++++ b/src/main/java/org/codehaus/plexus/maven/plugin/AbstractMergeMojo.java
+@@ -65,7 +65,7 @@
+     // ----------------------------------------------------------------------
+ 
+     /**
+-     * @component
++     * @component role="org.codehaus.plexus.cdc.ComponentDescriptorCreator"
+      */
+     private ComponentDescriptorCreator cdc;
+ 
+--- a/src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java
++++ b/src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java
+@@ -62,7 +62,7 @@
+     private MavenProject project;
+ 
+     /**
+-     * @component org.codehaus.doxia.siterenderer.Renderer
++     * @component role="org.codehaus.doxia.siterenderer.Renderer"
+      */
+     private Renderer siteRenderer;
+