[maven-filtering/f17] Replaced plexus-maven-plugin with containers-component-metadata
Tomas Radej
tradej at fedoraproject.org
Thu Mar 15 14:16:40 UTC 2012
commit f947c6d34f891a44d95f85751459a5a4059a53a5
Author: Tomas Radej <tradej at redhat.com>
Date: Mon Jan 16 10:54:15 2012 +0100
Replaced plexus-maven-plugin with containers-component-metadata
maven-filtering-plexus.patch | 19 +++++++++++++++++++
maven-filtering.depmap | 13 -------------
maven-filtering.spec | 13 ++++++++++---
3 files changed, 29 insertions(+), 16 deletions(-)
---
diff --git a/maven-filtering-plexus.patch b/maven-filtering-plexus.patch
new file mode 100644
index 0000000..f8295fe
--- /dev/null
+++ b/maven-filtering-plexus.patch
@@ -0,0 +1,19 @@
+diff --git a/pom.xml b/pom.xml
+index e3f2ed6..7d4f79e 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -125,12 +125,12 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.3.4</version>
+ <executions>
+ <execution>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
diff --git a/maven-filtering.spec b/maven-filtering.spec
index e2737b8..4e5156b 100644
--- a/maven-filtering.spec
+++ b/maven-filtering.spec
@@ -1,13 +1,15 @@
Name: maven-filtering
Version: 1.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Shared component providing resource filtering
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/shared/%{name}/index.html
Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
-Source1: maven-filtering.depmap
+# POM requires plexus-maven-plugin, which was replaced by
+# plexus-containers-component-metadata
+Patch0: %{name}-plexus.patch
BuildArch: noarch
@@ -15,6 +17,7 @@ BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: maven
BuildRequires: plexus-build-api
+BuildRequires: plexus-containers-component-metadata
BuildRequires: sisu
Requires: java >= 1:1.6.0
@@ -39,11 +42,12 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{name}-%{version}
+%patch0 -p1
%build
# Tests use a package that is no longer present in plexus-build-api (v0.0.7)
-mvn-rpmbuild install javadoc:aggregate -Dmaven.test.skip=true -Dmaven.local.depmap.file="%{SOURCE1}"
+mvn-rpmbuild install javadoc:aggregate -Dmaven.test.skip
%install
# jars
@@ -71,6 +75,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Thu Mar 15 2012 Tomas Radej <tradej at redhat.com> - 1.0-7
+- Replaced plexus-maven-plugin with plexus-containers-component-metadata
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list