commit becbb754234706e7bce3cf7d426aaf395cd64648
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Mon Apr 30 15:54:55 2012 +0200
Migration from plexus-maven-plugin to plexus-containers-component-metadata
...lp-plugin-migration-to-component-metadata.patch | 18 ++++++++++++++++++
maven-help-plugin.spec | 15 ++++++++++-----
2 files changed, 28 insertions(+), 5 deletions(-)
---
diff --git a/maven-help-plugin-migration-to-component-metadata.patch
b/maven-help-plugin-migration-to-component-metadata.patch
new file mode 100644
index 0000000..e7f3f6b
--- /dev/null
+++ b/maven-help-plugin-migration-to-component-metadata.patch
@@ -0,0 +1,18 @@
+diff -Naur maven-help-plugin-2.1.1.orig/pom.xml maven-help-plugin-2.1.1/pom.xml
+--- maven-help-plugin-2.1.1.orig/pom.xml 2012-04-30 15:45:38.000000000 +0200
++++ maven-help-plugin-2.1.1/pom.xml 2012-04-30 15:48:51.636000083 +0200
+@@ -175,12 +175,11 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
+- <version>1.3.8</version>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
diff --git a/maven-help-plugin.spec b/maven-help-plugin.spec
index ce3002f..f12b668 100644
--- a/maven-help-plugin.spec
+++ b/maven-help-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-help-plugin
Version: 2.1.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Plugin to to get relative information about a project or the system
Group: Development/Libraries
@@ -9,7 +9,7 @@ URL:
http://maven.apache.org/plugins/maven-help-plugin/
Source0:
http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
Patch0: add-compat.patch
Patch1: reduce-exception.patch
-
+Patch2: %{name}-migration-to-component-metadata.patch
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
@@ -27,6 +27,7 @@ BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: xstream
BuildRequires: jpackage-utils
+BuildRequires: plexus-containers-component-metadata
Requires: ant
Requires: maven
Requires: jpackage-utils
@@ -38,9 +39,9 @@ Provides: maven2-plugin-help = 0:%{version}-%{release}
%description
The Maven Help Plugin is used to get relative information about a project
- or the system. It can be used to get a description of a particular plugin,
+ or the system. It can be used to get a description of a particular plugin,
including the plugin's mojos with their parameters and component requirements,
-the effective POM and effective settings of the current build,
+the effective POM and effective settings of the current build,
and the profiles applied to the current project being built.
%package javadoc
@@ -53,9 +54,10 @@ API documentation for %{name}.
%prep
-%setup -q
+%setup -q
%patch0
%patch1
+%patch2 -p1
%build
# no junit-addons, skip test
@@ -87,6 +89,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+* Mon Apr 30 2012 Jaromir Capik <jcapik(a)redhat.com> 2.1.1-6
+- Migration from plexus-maven-plugin to plexus-containers-component-metadata
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
2.1.1-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild