This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-maven-plugin.
commit 41be8e7f0babcf2e9173f42d89c7177176bbfd39 Author: Ludovic Claude <[email protected]> Date: Wed Aug 5 10:54:13 2009 +0000 Fix component descriptors --- debian/changelog | 6 ++++++ debian/patches/descriptor.diff | 30 +++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 878a51b..f9af472 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +plexus-maven-plugin (1.3.8-4) experimental; urgency=low + + * Fix component descriptors + + -- Ludovic Claude <[email protected]> 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 diff --git a/debian/patches/descriptor.diff b/debian/patches/descriptor.diff index 247ec10..40624ba 100644 --- a/debian/patches/descriptor.diff +++ b/debian/patches/descriptor.diff @@ -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; + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-maven-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
