[java-sig-commits] [plexus-active-collections] Migration to plexus-containers-component-metadata

[Stanislav Ochotnicky]

commit 25d910d94150d665f79f800cfafa44542dbb99d0
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Wed Jul 27 14:13:04 2011 +0200

    Migration to plexus-containers-component-metadata

 ...llections-migration-to-component-metadata.patch |   19 +++++++++++++++++++
 plexus-active-collections.spec                     |   17 +++++++++--------
 2 files changed, 28 insertions(+), 8 deletions(-)
---
diff --git a/plexus-active-collections-migration-to-component-metadata.patch b/plexus-active-collections-migration-to-component-metadata.patch
new file mode 100644
index 0000000..a0554d2
--- /dev/null
+++ b/plexus-active-collections-migration-to-component-metadata.patch
@@ -0,0 +1,19 @@
+diff -Naur plexus-active-collections-1.0-beta-2.orig/pom.xml plexus-active-collections-1.0-beta-2/pom.xml
+--- plexus-active-collections-1.0-beta-2.orig/pom.xml	2008-02-19 04:54:43.000000000 +0100
++++ plexus-active-collections-1.0-beta-2/pom.xml	2011-07-27 13:51:58.963638701 +0200
+@@ -44,13 +44,12 @@
+       </plugin>
+       <plugin>
+         <groupId>org.codehaus.plexus</groupId>
+-        <artifactId>plexus-maven-plugin</artifactId>
+-        <version>1.3</version>
++        <artifactId>plexus-component-metadata</artifactId>
+         <executions>
+           <execution>
+             <id>create-component-descriptor</id>
+             <goals>
+-              <goal>descriptor</goal>
++              <goal>generate-metadata</goal>
+             </goals>
+           </execution>
+           <!-- 
diff --git a/plexus-active-collections.spec b/plexus-active-collections.spec
index ba6bd23..9871bb5 100644
--- a/plexus-active-collections.spec
+++ b/plexus-active-collections.spec
@@ -2,7 +2,7 @@
 
 Name:           plexus-active-collections
 Version:        1.0
-Release:        0.4.beta2%{?dist}
+Release:        0.5.beta2%{?dist}
 Summary:        Plexus Container-Backed Active Collections
 
 Group:          Development/Libraries
@@ -12,6 +12,8 @@ URL:            http://plexus.codehaus.org/
 #tar zcf plexus-active-collections-1.0-beta-2.tar.gz plexus-active-collections-1.0-beta-2/
 Source0:        plexus-active-collections-1.0-beta-2.tar.gz
 
+Patch0:         %{name}-migration-to-component-metadata.patch
+
 BuildArch: noarch
 
 BuildRequires:  java >= 1:1.6.0
@@ -32,7 +34,7 @@ BuildRequires:  maven-shared-reporting-impl
 BuildRequires:  maven-plugin-testing-harness
 BuildRequires:  maven-doxia
 BuildRequires:  maven-doxia-sitetools
-BuildRequires:  plexus-maven-plugin
+BuildRequires:  plexus-containers-component-metadata
 BuildRequires:  plexus-component-api
 BuildRequires:  plexus-container-default
 BuildRequires:  junit
@@ -61,6 +63,7 @@ API documentation for %{name}.
 
 %prep
 %setup -q -n %{name}-%{project_version}
+%patch0 -p1
 
 %build
 mvn-rpmbuild \
@@ -83,12 +86,6 @@ install -pm 644 pom.xml \
 install -d -m 0755 %{buildroot}%{_javadocdir}/plexus/%{name}
 cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}/
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
 %{_javadir}/plexus/*
 %{_mavenpomdir}/*
@@ -98,6 +95,10 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}/
 %{_javadocdir}/plexus/%{name}
 
 %changelog
+* Wed Jul 27 2011 Jaromir Capik <jcapik at redhat.com> - 1.0-0.5.beta2
+- Migration from plexus-maven-plugin to plexus-containers-component-metadata
+- Minor spec file changes according to the latest guidelines
+
 * Sun Jun 12 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.4.beta2
 - Build with maven 3.x.