[maven-help-plugin] Add patch maven-plugin-tools-3 compatibility

Mikolaj Izdebski mizdebsk at fedoraproject.org
Mon Jan 7 14:17:38 UTC 2013


commit 9cbbd3a86395ca138ee9a583c1a691f11476c776
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Mon Jan 7 12:22:41 2013 +0100

    Add patch maven-plugin-tools-3 compatibility
    
    In newer versions of maven-plugin-tools the PluginUtils.toText()
    static method was moved to GeneratorUtils class.

 maven-help-plugin.spec |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/maven-help-plugin.spec b/maven-help-plugin.spec
index 683190f..0d4d6ed 100644
--- a/maven-help-plugin.spec
+++ b/maven-help-plugin.spec
@@ -29,11 +29,13 @@ BuildRequires: maven-plugin-exec
 BuildRequires: xstream
 BuildRequires: jpackage-utils
 BuildRequires: plexus-containers-component-metadata
+BuildRequires: maven-plugin-tools-generators
 Requires: ant
 Requires: maven
 Requires: jpackage-utils
 Requires: java
 Requires: xstream
+Requires: maven-plugin-tools-generators
 
 Obsoletes: maven2-plugin-help < 0:%{version}-%{release}
 Provides: maven2-plugin-help = 0:%{version}-%{release}
@@ -60,6 +62,12 @@ API documentation for %{name}.
 %patch1
 %patch2 -p1
 
+# In newer versions of maven-plugin-tools the PluginUtils.toText()
+# static method was moved to GeneratorUtils class.
+%pom_add_dep org.apache.maven.plugin-tools:maven-plugin-tools-generators
+sed -i "s|PluginUtils.toText|org.apache.maven.tools.plugin.generator.GeneratorUtils.toText|" \
+    src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
+
 # Generated HelpMojo.java is missing package declaration.  Use exec
 # plugin to inject package declaration during process-sources phase.
 %pom_add_plugin org.codehaus.mojo:exec-maven-plugin . "
@@ -112,6 +120,7 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 %changelog
 * Mon Jan  7 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.1.1-8
 - Fix HelpMojo.java package declaration
+- Add patch maven-plugin-tools-3.x compatibility
 
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild


More information about the scm-commits mailing list